aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2013-08-27 13:33:37 -0400
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2013-08-27 13:33:37 -0400
commit673b527534893a4a8adb3cdef52fc645c13598ce (patch)
tree3598ee4d4daae0c5d9e45506704acea1731208ca /src
parent8d00ab630668a15e86b584b39187ef3bf3154511 (diff)
downloadpostgresql-673b527534893a4a8adb3cdef52fc645c13598ce.tar.gz
postgresql-673b527534893a4a8adb3cdef52fc645c13598ce.zip
Fix some "translator:" comments mangled by pgindent
Diffstat (limited to 'src')
-rw-r--r--src/bin/psql/describe.c7
-rw-r--r--src/interfaces/ecpg/ecpglib/error.c182
2 files changed, 55 insertions, 134 deletions
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index 9b6b9c2cd0a..dad1d5ac0de 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -2372,10 +2372,9 @@ add_tablespace_footer(printTableContent *const cont, char relkind,
/* Append the tablespace to the latest footer */
printfPQExpBuffer(&buf, "%s", cont->footer->data);
- /*
- * translator: before this string there's an index
- * description like '"foo_pkey" PRIMARY KEY, btree (a)'
- */
+ /*-------
+ translator: before this string there's an index description like
+ '"foo_pkey" PRIMARY KEY, btree (a)' */
appendPQExpBuffer(&buf, _(", tablespace \"%s\""),
PQgetvalue(result, 0, 0));
printTableSetFooter(cont, buf.data);
diff --git a/src/interfaces/ecpg/ecpglib/error.c b/src/interfaces/ecpg/ecpglib/error.c
index ee553fdca32..715bedba80f 100644
--- a/src/interfaces/ecpg/ecpglib/error.c
+++ b/src/interfaces/ecpg/ecpglib/error.c
@@ -21,260 +21,182 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
{
case ECPG_NOT_FOUND:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("no data found on line %d"), line);
break;
case ECPG_OUT_OF_MEMORY:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("out of memory on line %d"), line);
break;
case ECPG_UNSUPPORTED:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("unsupported type \"%s\" on line %d"), str, line);
break;
case ECPG_TOO_MANY_ARGUMENTS:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("too many arguments on line %d"), line);
break;
case ECPG_TOO_FEW_ARGUMENTS:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("too few arguments on line %d"), line);
break;
case ECPG_INT_FORMAT:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("invalid input syntax for type int: \"%s\", on line %d"), str, line);
break;
case ECPG_UINT_FORMAT:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("invalid input syntax for type unsigned int: \"%s\", on line %d"), str, line);
break;
case ECPG_FLOAT_FORMAT:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("invalid input syntax for floating-point type: \"%s\", on line %d"), str, line);
break;
case ECPG_CONVERT_BOOL:
if (str)
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("invalid syntax for type boolean: \"%s\", on line %d"), str, line);
else
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("could not convert boolean value: size mismatch, on line %d"), line);
break;
case ECPG_EMPTY:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("empty query on line %d"), line);
break;
case ECPG_MISSING_INDICATOR:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("null value without indicator on line %d"), line);
break;
case ECPG_NO_ARRAY:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("variable does not have an array type on line %d"), line);
break;
case ECPG_DATA_NOT_ARRAY:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("data read from server is not an array on line %d"), line);
break;
case ECPG_ARRAY_INSERT:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("inserting an array of variables is not supported on line %d"), line);
break;
case ECPG_NO_CONN:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("connection \"%s\" does not exist on line %d"), str, line);
break;
case ECPG_NOT_CONN:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("not connected to connection \"%s\" on line %d"), str, line);
break;
case ECPG_INVALID_STMT:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("invalid statement name \"%s\" on line %d"), str, line);
break;
case ECPG_UNKNOWN_DESCRIPTOR:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("descriptor \"%s\" not found on line %d"), str, line);
break;
case ECPG_INVALID_DESCRIPTOR_INDEX:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("descriptor index out of range on line %d"), line);
break;
case ECPG_UNKNOWN_DESCRIPTOR_ITEM:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("unrecognized descriptor item \"%s\" on line %d"), str, line);
break;
case ECPG_VAR_NOT_NUMERIC:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("variable does not have a numeric type on line %d"), line);
break;
case ECPG_VAR_NOT_CHAR:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("variable does not have a character type on line %d"), line);
break;
case ECPG_TRANS:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("error in transaction processing on line %d"), line);
break;
case ECPG_CONNECT:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("could not connect to database \"%s\" on line %d"), str, line);
break;
default:
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
-
- /*
- * translator: this string will be truncated at 149 characters
- * expanded.
- */
+ /*------
+ translator: this string will be truncated at 149 characters expanded. */
ecpg_gettext("SQL error %d on line %d"), code, line);
break;
}