From 706fccb50e3eaf6654fc349d52c3b84beddc0bf1 Mon Sep 17 00:00:00 2001
From: Marcin Cieslak <saper@saper.info>
Date: Mon, 13 Aug 2012 12:08:03 +0200
Subject: [PATCH] NULL is a pointer, not string terminator

Replace some instances of NULL to '\0', when
referring to string terminator.
---
 cde/lib/csa/api.c        |  2 +-
 cde/lib/csa/attr.c       |  6 +++---
 cde/lib/csa/calendar.c   |  8 ++++----
 cde/lib/csa/cmsdata.c    |  2 +-
 cde/lib/csa/convert4-5.c |  2 +-
 cde/lib/csa/convert5-4.c |  6 +++---
 cde/lib/csa/entry.c      |  4 ++--
 cde/lib/csa/iso8601.c    |  2 +-
 cde/lib/csa/laccess.c    | 14 +++++++-------
 cde/lib/csa/lutil.c      |  2 +-
 cde/lib/csa/match.c      |  6 +++---
 cde/lib/csa/nametbl.c    |  2 +-
 cde/lib/csa/reparser.y   |  4 ++--
 cde/lib/csa/rpccalls.c   |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/cde/lib/csa/api.c b/cde/lib/csa/api.c
index 5ca49af7e..9c789a51c 100644
--- a/cde/lib/csa/api.c
+++ b/cde/lib/csa/api.c
@@ -997,7 +997,7 @@ csa_list_entry_sequence(
 		rtype = &entry->e->attrs[CSA_ENTRY_ATTR_RECURRENCE_RULE_I];
 		if (rtype->value == NULL ||
 		    rtype->value->item.string_value == NULL ||
-		    *(rtype->value->item.string_value) == NULL) {
+		    *(rtype->value->item.string_value) == '\0' ) {
 			return (CSA_E_INVALID_PARAMETER);
 		}
 	}
diff --git a/cde/lib/csa/attr.c b/cde/lib/csa/attr.c
index 2dc4d0265..eaa168417 100644
--- a/cde/lib/csa/attr.c
+++ b/cde/lib/csa/attr.c
@@ -1907,8 +1907,8 @@ _CheckNameAtHost(char *owner, char *value)
 			return (CSA_E_FAILURE);
 	}
 
-	if (optr = strchr(owner, '@')) *optr = NULL;
-	if (ptr = strchr(value, '@')) *ptr = NULL;
+	if (optr = strchr(owner, '@')) *optr = '\0';
+	if (ptr = strchr(value, '@')) *ptr = '\0';
 	res = strcmp(value, owner);
 	if (optr) *optr = '@';
 	if (ptr) *ptr = '@';
@@ -1965,7 +1965,7 @@ _CheckCalendarName(char *owner, char *cname, cms_attribute_value *val)
 	/* now make sure if cal name is a user name, it's
 	 * the same as that of the calling user
 	 */
-	if (ptr = strchr(val->item.string_value, '@')) *ptr = NULL;
+	if (ptr = strchr(val->item.string_value, '@')) *ptr = '\0';
 	isuser = _DtCmIsUserName(val->item.string_value);
 	if (ptr) *ptr = '@';
 
diff --git a/cde/lib/csa/calendar.c b/cde/lib/csa/calendar.c
index 007980697..ea1b75b5d 100644
--- a/cde/lib/csa/calendar.c
+++ b/cde/lib/csa/calendar.c
@@ -90,7 +90,7 @@ _DtCm_new_Calendar(const char *calendar)
 	if ((cal = (Calendar *)malloc(sizeof(Calendar))) == NULL)
 		return(NULL);
 
-	memset((void *)cal, NULL, sizeof(Calendar));
+	memset((void *)cal, 0, sizeof(Calendar));
 
 	if ((cal->name = strdup(calendar)) == NULL) {
 		free(cal);
@@ -305,7 +305,7 @@ _DtCm_list_old_cal_attr_names(
 	for (i = 1, j = 0; i <= _DtCM_DEFINED_CAL_ATTR_SIZE; i++) {
 		if (_CSA_cal_attr_info[i].fst_vers > 0 &&
 		    _CSA_cal_attr_info[i].fst_vers <= cal->file_version) {
-			if (i == CSA_CAL_ATTR_CALENDAR_OWNER_I && *buf == NULL)
+			if (i == CSA_CAL_ATTR_CALENDAR_OWNER_I && *buf == '\0')
 				continue;
 
 			if ((names[j] =
@@ -527,7 +527,7 @@ _get_owner_from_old_cal(Calendar *cal, char *owner)
 	if (_DtCmIsUserName(calname) == B_TRUE)
 		strcpy(owner, calname);
 	else
-		*owner = NULL;
+		*owner = '\0';
 
 	free(calname);
 	return (CSA_SUCCESS);
@@ -555,7 +555,7 @@ _get_calendar_owner(
 	} else {
 		if ((stat = _get_owner_from_old_cal(cal, buf)) != CSA_SUCCESS)
 			return (stat);
-		else if (*buf == NULL)
+		else if (*buf == '\0')
 			return (CSA_SUCCESS);
 		else
 			owner = buf;
diff --git a/cde/lib/csa/cmsdata.c b/cde/lib/csa/cmsdata.c
index 1ce04b14f..3893a5915 100644
--- a/cde/lib/csa/cmsdata.c
+++ b/cde/lib/csa/cmsdata.c
@@ -164,7 +164,7 @@ _DtCmGrowAttrArray(uint *num_attrs, cms_attribute **attrs, cms_attribute *attr)
 		return (CSA_E_INSUFFICIENT_MEMORY);
 	else {
 		*attrs = newptr;
-		memset((void *)&(*attrs)[*num_attrs+1], NULL,
+		memset((void *)&(*attrs)[*num_attrs+1], 0,
 			sizeof(cms_attribute) * (index - *num_attrs));
 	}
 
diff --git a/cde/lib/csa/convert4-5.c b/cde/lib/csa/convert4-5.c
index dfca086db..344c4a2ae 100644
--- a/cde/lib/csa/convert4-5.c
+++ b/cde/lib/csa/convert4-5.c
@@ -378,7 +378,7 @@ _DtCmAttr4ToReminderValue(
 	_csa_duration_to_iso8601(atoi(remval->value), timestr);
 	rval.lead_time = timestr;
 
-	if (remval->clientdata && *remval->clientdata != NULL) {
+	if (remval->clientdata && *remval->clientdata != '\0') {
 		rval.reminder_data.size = strlen(remval->clientdata);
 		rval.reminder_data.data = (unsigned char *)remval->clientdata;
 	} else {
diff --git a/cde/lib/csa/convert5-4.c b/cde/lib/csa/convert5-4.c
index 7ec6c5c8f..fb439d547 100644
--- a/cde/lib/csa/convert5-4.c
+++ b/cde/lib/csa/convert5-4.c
@@ -92,11 +92,11 @@ _DtCm_cmsattrs_to_apptdata(uint size, cms_attribute *attrs, Appt_4 *appt)
 	{
 		strncpy(buf, (char *)aptr->value->item.opaque_data_value->data,
 			aptr->value->item.opaque_data_value->size);
-		buf[aptr->value->item.opaque_data_value->size] = NULL;
+		buf[aptr->value->item.opaque_data_value->size] = '\0';
 
 		ptr = strchr(buf, ':');
 		if (ptr != NULL)
-			*ptr = NULL;
+			*ptr = '\0';
 
 		appt->appt_id.key = atol(buf);
 
@@ -819,7 +819,7 @@ _DtCm_add_reminder(char *rem, CSA_reminder * val, Appt_4 *appt)
 		}
 		memcpy(newattr->clientdata, val->reminder_data.data,
 			val->reminder_data.size);
-		newattr->clientdata[val->reminder_data.size] = NULL;
+		newattr->clientdata[val->reminder_data.size] = '\0';
 
 	} else if ((newattr->clientdata = calloc(1,1)) == NULL) {
 		_DtCm_free_attr4(newattr);
diff --git a/cde/lib/csa/entry.c b/cde/lib/csa/entry.c
index 5e87cc5e0..f4febf513 100644
--- a/cde/lib/csa/entry.c
+++ b/cde/lib/csa/entry.c
@@ -578,7 +578,7 @@ _DtCm_free_entry_content(uint dummy, _DtCm_libentry *entry)
 {
 	_DtCm_remove_from_entry_list(entry->cal, (caddr_t)entry, (caddr_t)entry);
 	if (entry->e) _DtCm_free_cms_entry(entry->e);
-	memset((void *)entry, NULL, sizeof(_DtCm_libentry));
+	memset((void *)entry, 0, sizeof(_DtCm_libentry));
 }
 
 /*
@@ -611,7 +611,7 @@ _DtCm_free_libentries(_DtCm_libentry *entry)
 		nptr = entry->next;
 
 		if (entry->e) _DtCm_free_cms_entry(entry->e);
-		memset((void *)entry, NULL, sizeof(_DtCm_libentry));
+		memset((void *)entry, 0, sizeof(_DtCm_libentry));
 
 		free(entry);
 
diff --git a/cde/lib/csa/iso8601.c b/cde/lib/csa/iso8601.c
index ef7a55cce..559919230 100644
--- a/cde/lib/csa/iso8601.c
+++ b/cde/lib/csa/iso8601.c
@@ -318,7 +318,7 @@ _csa_iso8601_to_duration(char *buf, time_t *sec)
    numptr = ptr;
    while (*ptr >= '0' && *ptr <= '9') ptr++;
 
-   if (numptr == ptr || !(*ptr && *ptr++ == 'S' && *ptr == NULL))
+   if (numptr == ptr || !(*ptr && *ptr++ == 'S' && *ptr == '\0'))
 	return (-1);
    else {
 	num = atoi(numptr);
diff --git a/cde/lib/csa/laccess.c b/cde/lib/csa/laccess.c
index 631f38d96..0da60b304 100644
--- a/cde/lib/csa/laccess.c
+++ b/cde/lib/csa/laccess.c
@@ -215,10 +215,10 @@ match_forward(char *str1, char *str2)
 		get_component(&str2, com2, '.');
 
 		if (*com1) {
-			if (*com2 == NULL)
+			if (*com2 == '\0')
 				return (B_TRUE);
 		} else {
-			if (*com2 == NULL)
+			if (*com2 == '\0')
 				return (B_TRUE);
 			else
 				return (B_FALSE);
@@ -229,18 +229,18 @@ match_forward(char *str1, char *str2)
 
 		/* take care of case: a.b a. */
 		if (strcmp(str2, ".") == 0
-		    && (strcmp(str1, ".") != 0 || *str1 != NULL))
+		    && (strcmp(str1, ".") != 0 || *str1 != '\0'))
 			return (B_FALSE);
 
 		/* skip "." */
 		if (*str1 == '.') {
-			if (*str2 == NULL)
+			if (*str2 == '\0')
 				return (B_TRUE);
 			else {
 				str1++;
 				str2++;
 			}
-		} else if (strcmp(str2, ".") == 0 || *str2 == NULL)
+		} else if (strcmp(str2, ".") == 0 || *str2 == '\0')
 			return (B_TRUE);
 		else
 			return (B_FALSE);
@@ -278,10 +278,10 @@ match_backward(char *str1, char *str2)
 		get_last_component(str2, &ptr2, com2, '.');
 
 		if (*com1) {
-			if (*com2 == NULL)
+			if (*com2 == '\0')
 				return (B_TRUE);
 		} else {
-			if (*com2 == NULL)
+			if (*com2 == '\0')
 				return (B_TRUE);
 			else
 				return (B_FALSE);
diff --git a/cde/lib/csa/lutil.c b/cde/lib/csa/lutil.c
index 1191c8617..9a3ff7a48 100644
--- a/cde/lib/csa/lutil.c
+++ b/cde/lib/csa/lutil.c
@@ -69,7 +69,7 @@ _DtCmGetPrefix(char *str, char sep)
         if (ptr == buf)
                 return(NULL);
         else {
-                *ptr = NULL;
+                *ptr = '\0';
                 return(strdup(buf));
         }
 }
diff --git a/cde/lib/csa/match.c b/cde/lib/csa/match.c
index 1b1dc77a1..805a90859 100644
--- a/cde/lib/csa/match.c
+++ b/cde/lib/csa/match.c
@@ -1134,15 +1134,15 @@ contain_substr(char *str1, char *str2)
 {
 	int	i, len;
 
-	if (str2 == NULL || *str2 == NULL)
+	if (str2 == NULL || *str2 == '\0')
 		return (B_TRUE);
 
-	if (str1 == NULL || *str1 == NULL) {
+	if (str1 == NULL || *str1 == '\0') {
 		return (B_FALSE);
 	} else {
 		len = strlen(str2);
 
-		for (i = 0; str1[i] != NULL; i++) {
+		for (i = 0; str1[i] != '\0'; i++) {
 			if (strncasecmp(&str1[i], str2, len) == 0)
 				return (B_TRUE);
 		}
diff --git a/cde/lib/csa/nametbl.c b/cde/lib/csa/nametbl.c
index b06f4ef0d..2fd22f00d 100644
--- a/cde/lib/csa/nametbl.c
+++ b/cde/lib/csa/nametbl.c
@@ -120,7 +120,7 @@ _DtCm_add_name_to_table(_DtCmNameTable *tbl, int index, char *newname)
 			return (CSA_E_INSUFFICIENT_MEMORY);
 		} else {
 			tbl->names = newptr;
-			memset((void *)&tbl->names[tbl->size+1], NULL,
+			memset((void *)&tbl->names[tbl->size+1], 0,
 				sizeof(char *)*(index - tbl->size));
 		}
 	}
diff --git a/cde/lib/csa/reparser.y b/cde/lib/csa/reparser.y
index 9044765e4..4c2a19a2d 100644
--- a/cde/lib/csa/reparser.y
+++ b/cde/lib/csa/reparser.y
@@ -435,12 +435,12 @@ occurrence	: FIRSTWEEK endMarker
 
 endDate	: /* empty */
 		    {
-			$$ = NULL;
+			$$ = '\0';
 		    }
 	| DATE
 		    {
 			if (_csa_iso8601_to_tick($1, &$$) == -1)
-				$$ = NULL;
+				$$ = '\0';
 		    }
 		;
 
diff --git a/cde/lib/csa/rpccalls.c b/cde/lib/csa/rpccalls.c
index 30ac82e81..a4a7cd52f 100644
--- a/cde/lib/csa/rpccalls.c
+++ b/cde/lib/csa/rpccalls.c
@@ -226,7 +226,7 @@ _DtCm_rpc_create_calendar(
 		/* check to make sure user is not creating a calendar
 		 * using another user's name
 		 */
-		if (ptr = strchr(cal->name, '@')) *ptr = NULL;
+		if (ptr = strchr(cal->name, '@')) *ptr = '\0';
 		if (_DtCmIsUserName(cal->name) == B_TRUE) {
 
 			if ((owner = _DtCmGetUserName()) == NULL)
@@ -1412,7 +1412,7 @@ _GetV4UserAccess(Calendar *cal, cms_access_entry *alist)
 	boolean_t isowner = B_FALSE;
 
 	/* first check if user is owner */
-	if (ptr = strchr(cal->name, '@')) *ptr = NULL;
+	if (ptr = strchr(cal->name, '@')) *ptr = '\0';
 
 	if (_DtCmIsUserName(cal->name) == B_TRUE) {
 		if (strcmp(user, cal->name) == 0) {