Changeset: c62f94de664f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c62f94de664f
Modified Files:
sql/server/rel_dump.c
Branch: default
Log Message:
Function dump_escape_ident should always get and return non-NULL.
diffs (35 lines):
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -77,22 +77,20 @@ cmp_print(mvc *sql, stream *fout, int cm
mnstr_printf(fout, " %s ", r);
}
+__attribute__((__nonnull__(2)))
static const char *
dump_escape_ident(allocator *sa, const char *s)
{
- char *res = NULL;
- if (s) {
- size_t l = strlen(s);
- char *r = SA_NEW_ARRAY(sa, char, (l * 2) + 1);
+ size_t l = strlen(s);
+ char *r = SA_NEW_ARRAY(sa, char, (l * 2) + 1);
+ char *res = r;
- res = r;
- while (*s) {
- if (*s == '"' || *s == '\\')
- *r++ = '\\';
- *r++ = *s++;
- }
- *r = '\0';
+ while (*s) {
+ if (*s == '"' || *s == '\\')
+ *r++ = '\\';
+ *r++ = *s++;
}
+ *r = '\0';
return res;
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
