From: Michael Meskes Date: Wed, 26 Nov 2008 15:37:01 +0000 (+0000) Subject: Replaced strchrnul by strchr. X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=812ad4c9dbde863e492232e9b799277cdf2ef709;p=users%2Fbernd%2Fpostgres.git Replaced strchrnul by strchr. --- diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c index cd43d16ac1..a7d705187c 100644 --- a/src/interfaces/ecpg/preproc/type.c +++ b/src/interfaces/ecpg/preproc/type.c @@ -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) { @@ -353,7 +353,8 @@ ECPGdump_a_simple(FILE *o, const char *name, enum ECPGttype type, /* remove trailing [] is name is array element */ var_name = strdup(name); - *(strchrnul(var_name, '[')) = '\0'; + ptr = strchr(var_name, '['); + if (ptr) *ptr = '\0'; if (lineno) sprintf(offset, "sizeof(struct varchar_%s_%d)", var_name, lineno); else