diff options
| author | Michael Meskes <meskes@postgresql.org> | 2008-11-26 15:37:01 +0000 |
|---|---|---|
| committer | Michael Meskes <meskes@postgresql.org> | 2008-11-26 15:37:01 +0000 |
| commit | 0b1953868e008f9eaa4f03b4e48f380d47e65b02 (patch) | |
| tree | 98570cba0783a1b94c4ebe5f275a1d4dc526dfc2 | |
| parent | c892504fa619ff567c54ccf1c56e19be86512d59 (diff) | |
| download | postgresql-0b1953868e008f9eaa4f03b4e48f380d47e65b02.tar.gz postgresql-0b1953868e008f9eaa4f03b4e48f380d47e65b02.zip | |
Replaced strchrnul by strchr.
| -rw-r--r-- | src/interfaces/ecpg/preproc/type.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c index 5d9f83a4fd1..f59267725e9 100644 --- a/src/interfaces/ecpg/preproc/type.c +++ b/src/interfaces/ecpg/preproc/type.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/type.c,v 1.77.2.2 2008/11/26 13:19:34 meskes Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/type.c,v 1.77.2.3 2008/11/26 15:37:01 meskes Exp $ */ #include "postgres_fe.h" @@ -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 |