]> granicus.if.org Git - php/commitdiff
Use proper form of NUL
authorSascha Schumann <sas@php.net>
Sun, 24 Nov 2002 16:23:37 +0000 (16:23 +0000)
committerSascha Schumann <sas@php.net>
Sun, 24 Nov 2002 16:23:37 +0000 (16:23 +0000)
Drop superfluous checks for NULL results

ext/pgsql/pgsql.c

index 0b75af16faa6c7822393b84f00b5c69a043f73a2..f82e1be7afffea254595bc9761ee9401e531c0b2 100644 (file)
@@ -2665,8 +2665,6 @@ static unsigned char * php_pgsql_unescape_bytea(unsigned char *strtext, size_t *
        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 @@ static unsigned char * php_pgsql_unescape_bytea(unsigned char *strtext, size_t *
                }
        }
        buffer = erealloc(buffer, buflen+1);
-       buffer[buflen] = 0;
-       if (buffer == NULL)
-               return NULL;
+       buffer[buflen] = '\0';
 
        *retbuflen = buflen;
        return buffer;