diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2011-12-27 21:19:09 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2011-12-27 21:19:09 +0200 |
| commit | 037a82704ce644e2b1c3946345b54444caddb1a5 (patch) | |
| tree | d89abc55ac119b86d69c01f819ab8fb22a1382c6 /src/interfaces/ecpg/ecpglib | |
| parent | d383c23f6fbc4a79dae66483cf4f7051121008ad (diff) | |
| download | postgresql-037a82704ce644e2b1c3946345b54444caddb1a5.tar.gz | |
Standardize treatment of strcmp() return value
Always compare the return value to 0, don't use cute tricks like
if (!strcmp(...)).
Diffstat (limited to 'src/interfaces/ecpg/ecpglib')
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/data.c | 6 | ||||
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/descriptor.c | 2 | ||||
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/execute.c | 6 | ||||
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/prepare.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c index fc0455607b..db975035df 100644 --- a/src/interfaces/ecpg/ecpglib/data.c +++ b/src/interfaces/ecpg/ecpglib/data.c @@ -97,19 +97,19 @@ get_float8_nan(void) static bool check_special_value(char *ptr, double *retval, char **endptr) { - if (!pg_strncasecmp(ptr, "NaN", 3)) + if (pg_strncasecmp(ptr, "NaN", 3) == 0) { *retval = get_float8_nan(); *endptr = ptr + 3; return true; } - else if (!pg_strncasecmp(ptr, "Infinity", 8)) + else if (pg_strncasecmp(ptr, "Infinity", 8) == 0) { *retval = get_float8_infinity(); *endptr = ptr + 8; return true; } - else if (!pg_strncasecmp(ptr, "-Infinity", 9)) + else if (pg_strncasecmp(ptr, "-Infinity", 9) == 0) { *retval = -get_float8_infinity(); *endptr = ptr + 9; diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c index 17a956ea5d..1dde52c42f 100644 --- a/src/interfaces/ecpg/ecpglib/descriptor.c +++ b/src/interfaces/ecpg/ecpglib/descriptor.c @@ -652,7 +652,7 @@ ECPGdeallocate_desc(int line, const char *name) ecpg_init_sqlca(sqlca); for (desc = get_descriptors(), prev = NULL; desc; prev = desc, desc = desc->next) { - if (!strcmp(name, desc->name)) + if (strcmp(name, desc->name) == 0) { if (prev) prev->next = desc->next; diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c index b8e48a366c..f468147b29 100644 --- a/src/interfaces/ecpg/ecpglib/execute.c +++ b/src/interfaces/ecpg/ecpglib/execute.c @@ -1650,9 +1650,9 @@ ecpg_execute(struct statement * stmt) ecpg_log("ecpg_execute on line %d: OK: %s\n", stmt->lineno, cmdstat); if (stmt->compat != ECPG_COMPAT_INFORMIX_SE && !sqlca->sqlerrd[2] && - (!strncmp(cmdstat, "UPDATE", 6) - || !strncmp(cmdstat, "INSERT", 6) - || !strncmp(cmdstat, "DELETE", 6))) + (strncmp(cmdstat, "UPDATE", 6) == 0 + || strncmp(cmdstat, "INSERT", 6) == 0 + || strncmp(cmdstat, "DELETE", 6) == 0)) ecpg_raise(stmt->lineno, ECPG_NOT_FOUND, ECPG_SQLSTATE_NO_DATA, NULL); break; case PGRES_COPY_OUT: diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c index 60c9c50b22..c5a554e8e2 100644 --- a/src/interfaces/ecpg/ecpglib/prepare.c +++ b/src/interfaces/ecpg/ecpglib/prepare.c @@ -361,7 +361,7 @@ SearchStmtCache(const char *ecpgQuery) { if (stmtCacheEntries[entNo].stmtID[0]) /* check if entry is in use */ { - if (!strcmp(ecpgQuery, stmtCacheEntries[entNo].ecpgQuery)) + if (strcmp(ecpgQuery, stmtCacheEntries[entNo].ecpgQuery) == 0) break; /* found it */ } ++entNo; /* incr entry # */ |