11294 abi: NULL pointer errors

Reviewed by: C Fraire <cfraire@me.com>
Approved by: Garrett D'Amore <garrett@damore.org>

9 files changed, 48 insertions, 64 deletions

diff --git a/usr/src/cmd/abi/appcert/static_prof/static_prof.c b/usr/src/cmd/abi/appcert/static_prof/static_prof.c
index 7d2d71c20f..83bd3c5fcc 100644
--- a/usr/src/cmd/abi/appcert/static_prof/static_prof.c
+++ b/usr/src/cmd/abi/appcert/static_prof/static_prof.c
@@ -331,7 +331,7 @@ obj_init(obj_list * c)
 				    "File <<%s>> : Already opened.\n",
 				    c->obj->ename);
 		}
-		c->obj->fd = NULL;
+		c->obj->fd = 0;
 		return (FAIL);
 	}
 	/*
diff --git a/usr/src/cmd/abi/spectrans/spec2map/bucket.c b/usr/src/cmd/abi/spectrans/spec2map/bucket.c
index 5a031a1706..77f2374775 100644
--- a/usr/src/cmd/abi/spectrans/spec2map/bucket.c
+++ b/usr/src/cmd/abi/spectrans/spec2map/bucket.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <malloc.h>
 #include <stdlib.h>
@@ -724,7 +722,7 @@ checksum(const char *p)
 {
 	int sum;
 
-	for (sum = 0; *p != NULL; ++p) {
+	for (sum = 0; *p != '\0'; ++p) {
 		if (sum & 01)
 			sum = (sum >> 1) + 0x8000;
 		else
diff --git a/usr/src/cmd/abi/spectrans/spec2trace/bindings.c b/usr/src/cmd/abi/spectrans/spec2trace/bindings.c
index 7c6f7d74de..95d937230c 100644
--- a/usr/src/cmd/abi/spectrans/spec2trace/bindings.c
+++ b/usr/src/cmd/abi/spectrans/spec2trace/bindings.c
@@ -24,8 +24,6 @@
  * All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <string.h>
 #include "parser.h"
@@ -169,7 +167,7 @@ generate_a_binding(char *name, char *value)
 	char	*q;
 
 	errlog(BEGIN, "generate_a_binding() {");
-	if (*value == NULL) {
+	if (*value == '\0') {
 		errlog(FATAL, "programmer error: asked to generate an "
 			"empty binding");
 	}
@@ -191,7 +189,7 @@ generate_a_binding(char *name, char *value)
 
 	/* Walk across line, emitting tokens and transformed tokens */
 
-	for (; *p != NULL; p = q) {
+	for (; *p != '\0'; p = q) {
 		p = skipb(p);
 		q = nextsep(p);
 
@@ -254,7 +252,7 @@ strpqcmp(char *v1, char *p, char *q)
 
 	errlog(BEGIN, "strpqcmp() {");
 	saved = *q;
-	*q = NULL;
+	*q = '\0';
 	rc = (strcmp(v1, p));
 	*q = saved;
 	errlog(END, "}");
@@ -271,7 +269,7 @@ strpqprint(char *p, char *q, FILE *fp)
 
 	errlog(BEGIN, "strpqprint() {");
 	saved = *q;
-	*q = NULL;
+	*q = '\0';
 	(void) fputs(p, fp);
 	*q = saved;
 	errlog(END, "}");
diff --git a/usr/src/cmd/abi/spectrans/spec2trace/db.c b/usr/src/cmd/abi/spectrans/spec2trace/db.c
index 6540bb6a37..df1090b960 100644
--- a/usr/src/cmd/abi/spectrans/spec2trace/db.c
+++ b/usr/src/cmd/abi/spectrans/spec2trace/db.c
@@ -24,8 +24,6 @@
  * All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * db.c -- the tiny database for trace.  Only stores
  *	global things: see symtab for per-function data.
@@ -74,7 +72,7 @@ db_set_current_library(char const *p)
 	errlog(BEGIN, "db_set_current_library() {");
 	(void) strncpy(Database.Current_Library, p,
 	    sizeof (Database.Current_Library));
-	Database.Current_Library[sizeof (Database.Current_Library) - 1] = NULL;
+	Database.Current_Library[sizeof (Database.Current_Library) - 1] = '\0';
 	errlog(END, "}");
 }
 
@@ -187,7 +185,7 @@ db_get_output_file(void)
 	char	*p, *q;
 
 	errlog(BEGIN, "db_get_output_file() {");
-	if (*Database.Output_File != NULL) {
+	if (*Database.Output_File != '\0') {
 		/* It was set with the -o option */
 		errlog(VERBOSE, "output file from -o = '%s'\n",
 			Database.Output_File);
diff --git a/usr/src/cmd/abi/spectrans/spec2trace/interceptor.c b/usr/src/cmd/abi/spectrans/spec2trace/interceptor.c
index e95765926a..7c8280715b 100644
--- a/usr/src/cmd/abi/spectrans/spec2trace/interceptor.c
+++ b/usr/src/cmd/abi/spectrans/spec2trace/interceptor.c
@@ -24,8 +24,6 @@
  * All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * interceptor.c -- a functional decomposition of generate.c,
  *	the code generator for apptrace
@@ -168,7 +166,7 @@ generate_i_declarations(char *errname, int voidfunc, char *ret_str)
 {
 
 	errlog(BEGIN, "generate_i_declarations() {");
-	if (*errname != NULL) {
+	if (*errname != '\0') {
 		/* Create locals for errno-type variable, */
 		(void) fprintf(Bodyfp,
 		    "    int saved_errvar = %s;\n", errname);
@@ -230,7 +228,7 @@ generate_i_call(
 
 	errlog(BEGIN, "generate_i_call() {");
 	/* Zero the error variable. */
-	if (*error_name != NULL) {
+	if (*error_name != '\0') {
 		(void) fprintf(Bodyfp,  "    %s = 0;\n", error_name);
 	}
 
@@ -246,7 +244,7 @@ generate_i_call(
 	}
 
 	/* Then set the local copy of the error variable. */
-	if (*error_name != NULL) {
+	if (*error_name != '\0') {
 		(void) fprintf(Bodyfp,
 		    "    functions_errvar = %s;\n", error_name);
 	}
@@ -387,7 +385,7 @@ generate_i_closedown(char *error_name, int void_func)
 	(void) fprintf(Bodyfp,
 	    "    abiunlock(&omask);\n");
 
-	if (*error_name != NULL) {
+	if (*error_name != '\0') {
 		/* Restore error variables. */
 		(void) fprintf(Bodyfp,
 		    "    %s = (functions_errvar == 0)? "
diff --git a/usr/src/cmd/abi/spectrans/spec2trace/printfuncs.c b/usr/src/cmd/abi/spectrans/spec2trace/printfuncs.c
index 22dea8d903..e42a59763e 100644
--- a/usr/src/cmd/abi/spectrans/spec2trace/printfuncs.c
+++ b/usr/src/cmd/abi/spectrans/spec2trace/printfuncs.c
@@ -24,8 +24,6 @@
  * All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -60,7 +58,7 @@ generate_printf(ENTRY *f)
 	(void) fprintf(Bodyfp, "    fprintf(ABISTREAM, \"");
 	p = &arglist[0];
 	l = (int)sizeof (arglist);
-	*p = NULL;
+	*p = '\0';
 	for (e = symtab_get_first_arg(); e != NULL; e = symtab_get_next_arg()) {
 		errlog(TRACING, "arglist = '%s'", arglist);
 
@@ -72,7 +70,7 @@ generate_printf(ENTRY *f)
 		if (p != &arglist[0]) {
 			(void) fprintf(Bodyfp, ", ");
 		}
-		if (*(name =  name_of(e)) == NULL) {
+		if (*(name =  name_of(e)) == '\0') {
 			/* It's a varargs indicator instead */
 			(void) fprintf(Bodyfp, "...");
 		} else {
@@ -80,7 +78,7 @@ generate_printf(ENTRY *f)
 			n = prepare_printf_part(e, name, p, l);
 			l -= n;
 			p += n;
-			*(p+1) = NULL;
+			*(p+1) = '\0';
 		}
 	}
 
@@ -156,7 +154,7 @@ generate_printfunc_calls(ENTRY *f)
 		if (is_void(e)) {
 			break;
 		}
-		if (*(name = name_of(e)) == NULL) {
+		if (*(name = name_of(e)) == '\0') {
 			(void) fprintf(Bodyfp, "        fputs(\"  ...\\n\", "
 				"ABISTREAM);\n");
 		}
@@ -231,7 +229,7 @@ generate_print_definitions(FILE *fp)
 		print_type != NULL;
 			print_type = db_get_next_print_type()) {
 		c_type = strchr(print_type, ','); /* Safe by construction. */
-		*c_type++ = NULL;
+		*c_type++ = '\0';
 		errlog(TRACING,  "print_type=%s\n", print_type);
 
 		pf_str_name = space_to_uscore(print_type);
@@ -268,7 +266,7 @@ generate_print_declarations(FILE *fp)
 		errlog(TRACING,  "print_type, c_type=%s\n", print_type);
 
 		c_type = strchr(print_type, ','); /* Safe by construction. */
-		*c_type++ = NULL;
+		*c_type++ = '\0';
 
 		pf_str_name = space_to_uscore(print_type);
 
diff --git a/usr/src/cmd/abi/spectrans/spec2trace/symtab.c b/usr/src/cmd/abi/spectrans/spec2trace/symtab.c
index 9eba8969bb..7f19ed48ba 100644
--- a/usr/src/cmd/abi/spectrans/spec2trace/symtab.c
+++ b/usr/src/cmd/abi/spectrans/spec2trace/symtab.c
@@ -24,8 +24,6 @@
  * All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>
@@ -147,10 +145,10 @@ symtab_clear_function(void)
 	errlog(BEGIN, "symtab_clear_function() {");
 	Symtab.Function = free_entry(Symtab.Function);
 	Symtab.Args = free_entry_table(Symtab.Args);
-	Symtab.Prototype[0] = NULL;
-	Symtab.Formals[0] = NULL;
-	Symtab.Actuals[0] = NULL;
-	Symtab.Cast[0] = NULL;
+	Symtab.Prototype[0] = '\0';
+	Symtab.Formals[0] = '\0';
+	Symtab.Actuals[0] = '\0';
+	Symtab.Cast[0] = '\0';
 	errlog(END, "}");
 }
 
@@ -224,7 +222,7 @@ symtab_set_prototype(char *p)
 
 	errlog(BEGIN, "symtab_set_prototype(void) {");
 	(void) strncpy(Symtab.Prototype, p, sizeof (Symtab.Prototype));
-	Symtab.Prototype[sizeof (Symtab.Prototype)-1] = NULL;
+	Symtab.Prototype[sizeof (Symtab.Prototype)-1] = '\0';
 	errlog(END, "}");
 }
 
@@ -241,7 +239,7 @@ symtab_set_formals(char *p)
 	errlog(BEGIN, "symtab_set_formals() {");
 	errlog(VERBOSE, "p = %s", p);
 	(void) strncpy(Symtab.Formals, p, sizeof (Symtab.Formals));
-	Symtab.Formals[sizeof (Symtab.Formals)-1] = NULL;
+	Symtab.Formals[sizeof (Symtab.Formals)-1] = '\0';
 	errlog(END, "}");
 }
 
@@ -258,7 +256,7 @@ symtab_set_actuals(char *p)
 	errlog(BEGIN, "symtab_set_actuals() {"); errlog(END, "}");
 	errlog(VERBOSE, "p = %s", p);
 	(void) strncpy(Symtab.Actuals, p, sizeof (Symtab.Actuals));
-	Symtab.Actuals[sizeof (Symtab.Actuals)-1] = NULL;
+	Symtab.Actuals[sizeof (Symtab.Actuals)-1] = '\0';
 }
 
 char *
@@ -273,7 +271,7 @@ symtab_set_cast(char *p)
 {
 	errlog(BEGIN, "symtab_set_cast() {"); errlog(END, "}");
 	(void) strncpy(Symtab.Cast, p, sizeof (Symtab.Cast));
-	Symtab.Cast[sizeof (Symtab.Cast)-1] = NULL;
+	Symtab.Cast[sizeof (Symtab.Cast)-1] = '\0';
 }
 
 char *
@@ -289,7 +287,7 @@ symtab_set_filename(const char *p)
 {
 	errlog(BEGIN, "symtab_set_filename() {"); errlog(END, "}");
 	(void) strncpy(Symtab.Filename, p, sizeof (Symtab.Filename));
-	Symtab.Filename[sizeof (Symtab.Filename)-1] = NULL;
+	Symtab.Filename[sizeof (Symtab.Filename)-1] = '\0';
 }
 
 char *
@@ -686,14 +684,14 @@ type_of(ENTRY *e)
 	if (e != NULL && (e->e_kind == PRIMITIVE || e->e_kind == VARARG)) {
 		p = e->e_type;
 		q = &buffer[0];
-		while (*p != NULL) {
+		while (*p != '\0') {
 			if (*p == '%') {
 				p += 2;
 			} else {
 				*q++ = *p++;
 			}
 		}
-		*q = NULL;
+		*q = '\0';
 		return (strtrim(&buffer[0]));
 	}
 	else
@@ -715,7 +713,7 @@ levels_of(ENTRY *e)
 	if (e != NULL && (e->e_kind == PRIMITIVE || e->e_kind == VARARG))
 		return (e->e_levels);
 	else
-		return (NULL);
+		return (0);
 }
 
 char *
diff --git a/usr/src/cmd/abi/spectrans/spec2trace/trace.c b/usr/src/cmd/abi/spectrans/spec2trace/trace.c
index a9fab97c02..1a80ad1512 100644
--- a/usr/src/cmd/abi/spectrans/spec2trace/trace.c
+++ b/usr/src/cmd/abi/spectrans/spec2trace/trace.c
@@ -24,8 +24,6 @@
  * All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  *
  * trace.c -- a  simple translator from spec source to c source for
@@ -628,8 +626,8 @@ to_basetype(char *str)
 	int	levels = 0;
 
 	assert(strlen(str) < MAXLINE, "string exceeded MAXLINE");
-	buffer[0] = NULL;
-	for (; *p != NULL; p++) {
+	buffer[0] = '\0';
+	for (; *p != '\0'; p++) {
 		switch (*p) {
 		case ' ': /* Convert spaces to single ' '. */
 			if (*(q-1) != ' ')
@@ -652,12 +650,12 @@ to_basetype(char *str)
 			*q++ = *p;
 			break;
 		}
-		*q = NULL;
+		*q = '\0';
 	}
 	assert(q < &buffer[MAXLINE], "q fell off end of buffer");
 	q--;
 	while (*q == ' ') {
-		*q-- = NULL;
+		*q-- = '\0';
 	}
 	assert(strlen(buffer) < MAXLINE, "buffer length exceeded MAXLINE");
 	(void) strcpy(str, buffer);
@@ -675,12 +673,12 @@ to_actual(void)
 	static char buffer[MAXLINE+1];
 	int	n;
 
-	*buffer = NULL;
+	*buffer = '\0';
 	if ((p = symtab_get_first_arg()) != NULL) {
 		n = MAXLINE - snprintf(buffer, MAXLINE, "%s", name_of(p));
 		for (p = symtab_get_next_arg(); p != NULL;
 						p = symtab_get_next_arg()) {
-			if (*name_of(p) != NULL)
+			if (*name_of(p) != '\0')
 				n -= snprintf(strend(buffer), n,
 					", %s", name_of(p));
 		}
@@ -698,7 +696,7 @@ strpqcpy(char *target, char *p, char *q)
 	char	saved;
 
 	saved = *q;
-	*q = NULL;
+	*q = '\0';
 	(void) strcpy(target, p);
 	*q = saved;
 	return (target);
diff --git a/usr/src/cmd/abi/spectrans/spec2trace/util.c b/usr/src/cmd/abi/spectrans/spec2trace/util.c
index 55eb115f7a..549eba1f40 100644
--- a/usr/src/cmd/abi/spectrans/spec2trace/util.c
+++ b/usr/src/cmd/abi/spectrans/spec2trace/util.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
@@ -52,16 +50,16 @@ strnormalize(char *str)
 {
 	char	*p;
 
-	if (str == NULL || *str == NULL)
+	if (str == NULL || *str == '\0')
 		return (str);
-	for (p = str; *p != NULL; p++) {
+	for (p = str; *p != '\0'; p++) {
 		if (isspace(*p)) {
 			*p = ' ';
 		}
 	}
 	p--;
 	while (p >= str && (isspace(*p) || *p == ';'))
-		*p-- = NULL;
+		*p-- = '\0';
 
 	/* ERA - remove leading spaces */
 	while (isspace(*str))
@@ -75,11 +73,11 @@ strtrim(char *str)
 {
 	char	*p;
 
-	for (p = str; *p != NULL; p++)
+	for (p = str; *p != '\0'; p++)
 		continue;
 	p--;
 	while (p >= str && isspace(*p))
-		*p-- = NULL;
+		*p-- = '\0';
 	return (str);
 }
 
@@ -92,7 +90,7 @@ strlower(char *str)
 {
 	char	*p;
 
-	for (p = str; *p != NULL; p++) {
+	for (p = str; *p != '\0'; p++) {
 		*p = tolower(*p);
 	}
 	return (str);
@@ -144,7 +142,7 @@ in_string_set(char *p, char *set)
 			break;
 		}
 		save = *q;
-		*q = NULL;
+		*q = '\0';
 		if (strcmp(p, set) == 0) {
 			*q = save;
 			errlog(VERBOSE, "return YES");
@@ -262,14 +260,14 @@ objectname(char *name)
 	static char basename[MAXLINE];
 
 	p = strrchr(name, '/');
-	while (p != NULL && *(p+1) == NULL) {
+	while (p != NULL && *(p+1) == '\0') {
 		/* The / was at the end of the name. */
-		*p = NULL;
+		*p = '\0';
 		p = strrchr(name, '/');
 	}
 	(void) strlcpy(basename, p? p+1: name, MAXLINE);
 	if ((p = strstr(basename, ".c")) != NULL) {
-		*p = NULL;
+		*p = '\0';
 	}
 	return (strcat(basename, ".o"));
 }
@@ -362,7 +360,7 @@ in_string_table(table_t *t, char *value)
 	}
 	for (i = 0; i <= t->used; i++) {
 		if (strncmp(value, t->elements[i], len) == 0 &&
-		    (t->elements[i][len] == NULL ||
+		    (t->elements[i][len] == '\0' ||
 			t->elements[i][len] == ','))
 			return (1);
 	}