sas Sun Nov 24 11:23:38 2002 EDT
Modified files:
/php4/ext/pgsql pgsql.c
Log:
Use proper form of NUL
Drop superfluous checks for NULL results
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.246 php4/ext/pgsql/pgsql.c:1.247
--- php4/ext/pgsql/pgsql.c:1.246 Sun Nov 24 10:11:43 2002
+++ php4/ext/pgsql/pgsql.c Sun Nov 24 11:23:37 2002
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.246 2002/11/24 15:11:43 sterling Exp $ */
+/* $Id: pgsql.c,v 1.247 2002/11/24 16:23:37 sas Exp $ */
#include <stdlib.h>
@@ -2665,8 +2665,6 @@
buflen = strlen(strtext); /* will shrink, also we discover if
* strtext */
buffer = (unsigned char *) emalloc(buflen); /* isn't NULL terminated */
- if (buffer == NULL)
- return NULL;
for (bp = buffer, sp = strtext; *sp != '\0'; bp++, sp++)
{
switch (state)
@@ -2731,9 +2729,7 @@
}
}
buffer = erealloc(buffer, buflen+1);
- buffer[buflen] = 0;
- if (buffer == NULL)
- return NULL;
+ buffer[buflen] = '\0';
*retbuflen = buflen;
return buffer;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
