Removed strchrnul
authorMichael Meskes <meskes@postgresql.org>
Wed, 26 Nov 2008 15:35:30 +0000 (15:35 +0000)
committerMichael Meskes <meskes@postgresql.org>
Wed, 26 Nov 2008 15:35:30 +0000 (15:35 +0000)
src/interfaces/ecpg/preproc/type.c

index e197b605bafd62d146e61d658adf49b0fba98e77..961666372cec8cc88a6edaaa4acbf65fce2d8d1d 100644 (file)
@@ -329,7 +329,7 @@ ECPGdump_a_simple(FILE *o, const char *name, enum ECPGttype type,
        {
                char *variable = (char *) mm_alloc(strlen(name) + ((prefix == NULL) ? 0 : strlen(prefix)) + 4);
                char *offset = (char *) mm_alloc(strlen(name) + strlen("sizeof(struct varchar_)") + 1 + strlen(varcharsize) + sizeof(int) * CHAR_BIT * 10 / 3);
-               char *var_name; 
+               char *var_name, *ptr
 
                switch (type)
                {
@@ -352,8 +352,9 @@ ECPGdump_a_simple(FILE *o, const char *name, enum ECPGttype type,
                                        sprintf(variable, "&(%s%s)", prefix ? prefix : "", name);
 
                                /* remove trailing [] is name is array element */
-                               var_name = strdup(name);
-                               *(strchrnul(var_name, '[')) = '\0';
+                               var_name = mm_strdup(name);
+                               ptr = strchr(var_name, '[');
+                               if (ptr) *ptr = '\0';
                                if (lineno)
                                        sprintf(offset, "sizeof(struct varchar_%s_%d)", var_name, lineno);
                                else