svn commit: samba r13591 - branches/SAMBA_3_0/source/lib trunk/source/lib

[jerry at samba.org]

Author: jerry
Date: 2006-02-21 15:47:19 +0000 (Tue, 21 Feb 2006)
New Revision: 13591

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13591

Log:
I really have no idea how this code ever worked.  And I have
no idea why no one (including myself) caught this with a compiler
warning....Make sure new_chunk() actually returns a pointer
to the allocated memory.

SAMBA_3_0 now works again on Solaris.



Modified:
   branches/SAMBA_3_0/source/lib/snprintf.c
   trunk/source/lib/snprintf.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/snprintf.c
===================================================================
--- branches/SAMBA_3_0/source/lib/snprintf.c	2006-02-21 14:34:11 UTC (rev 13590)
+++ branches/SAMBA_3_0/source/lib/snprintf.c	2006-02-21 15:47:19 UTC (rev 13591)
@@ -1112,25 +1112,28 @@
 }
 
 static struct pr_chunk *new_chunk(void) {
-	struct pr_chunk *new = (struct pr_chunk *)malloc(sizeof(struct pr_chunk));
+	struct pr_chunk *new_c = (struct pr_chunk *)malloc(sizeof(struct pr_chunk));
 
-	if (!new) return NULL;
+	if ( !new_c ) 
+		return NULL;
 
-	new->type = 0;
-	new->num = 0;
-	new->min = 0;
-	new->min_star = NULL;
-	new->max = -1;
-	new->max_star = NULL;
-	new->flags = 0;
-	new->cflags = 0;
-	new->start = 0;
-	new->len = 0;
-	new->value = 0;
-	new->fvalue = 0;
-	new->strvalue = NULL;
-	new->pnum = NULL;
-	new->next = NULL;
+	new_c->type = 0;
+	new_c->num = 0;
+	new_c->min = 0;
+	new_c->min_star = NULL;
+	new_c->max = -1;
+	new_c->max_star = NULL;
+	new_c->flags = 0;
+	new_c->cflags = 0;
+	new_c->start = 0;
+	new_c->len = 0;
+	new_c->value = 0;
+	new_c->fvalue = 0;
+	new_c->strvalue = NULL;
+	new_c->pnum = NULL;
+	new_c->next = NULL;
+
+	return new_c;
 }
 
 static int add_cnk_list_entry(struct pr_chunk_x **list,

Modified: trunk/source/lib/snprintf.c
===================================================================
--- trunk/source/lib/snprintf.c	2006-02-21 14:34:11 UTC (rev 13590)
+++ trunk/source/lib/snprintf.c	2006-02-21 15:47:19 UTC (rev 13591)
@@ -1112,25 +1112,28 @@
 }
 
 static struct pr_chunk *new_chunk(void) {
-	struct pr_chunk *new = (struct pr_chunk *)malloc(sizeof(struct pr_chunk));
+	struct pr_chunk *new_c = (struct pr_chunk *)malloc(sizeof(struct pr_chunk));
 
-	if (!new) return NULL;
+	if ( !new_c ) 
+		return NULL;
 
-	new->type = 0;
-	new->num = 0;
-	new->min = 0;
-	new->min_star = NULL;
-	new->max = -1;
-	new->max_star = NULL;
-	new->flags = 0;
-	new->cflags = 0;
-	new->start = 0;
-	new->len = 0;
-	new->value = 0;
-	new->fvalue = 0;
-	new->strvalue = NULL;
-	new->pnum = NULL;
-	new->next = NULL;
+	new_c->type = 0;
+	new_c->num = 0;
+	new_c->min = 0;
+	new_c->min_star = NULL;
+	new_c->max = -1;
+	new_c->max_star = NULL;
+	new_c->flags = 0;
+	new_c->cflags = 0;
+	new_c->start = 0;
+	new_c->len = 0;
+	new_c->value = 0;
+	new_c->fvalue = 0;
+	new_c->strvalue = NULL;
+	new_c->pnum = NULL;
+	new_c->next = NULL;
+
+	return new_c;
 }
 
 static int add_cnk_list_entry(struct pr_chunk_x **list,