diff options
Diffstat (limited to 'contrib/string')
| -rw-r--r-- | contrib/string/string_io.c | 15 | ||||
| -rw-r--r-- | contrib/string/string_io.h | 23 |
2 files changed, 19 insertions, 19 deletions
diff --git a/contrib/string/string_io.c b/contrib/string/string_io.c index 9407e6a21b3..cb8323d9c9b 100644 --- a/contrib/string/string_io.c +++ b/contrib/string/string_io.c @@ -23,7 +23,7 @@ #define ISO8859 #define MIN(x, y) ((x) < (y) ? (x) : (y)) -#define VALUE(char) ((char) - '0') +#define VALUE(char) ((char) - '0') #define DIGIT(val) ((val) + '0') #define ISOCTAL(c) (((c) >= '0') && ((c) <= '7')) #ifndef ISO8859 @@ -89,9 +89,8 @@ string_output(unsigned char *data, int size) break; case '{': /* Escape beginning of string, to distinguish from arrays */ - if (p == data) { + if (p == data) len++; - } break; default: if (NOTPRINTABLE(*p)) @@ -137,9 +136,8 @@ string_output(unsigned char *data, int size) break; case '{': /* Escape beginning of string, to distinguish from arrays */ - if (p == data) { + if (p == data) *r++ = '\\'; - } *r++ = c; break; default: @@ -361,14 +359,15 @@ c_charin(unsigned char *str) { return (string_input(str, 1, 0, NULL)); } + #endif /* end of file */ /* * Local Variables: - * tab-width: 4 - * c-indent-level: 4 - * c-basic-offset: 4 + * tab-width: 4 + * c-indent-level: 4 + * c-basic-offset: 4 * End: */ diff --git a/contrib/string/string_io.h b/contrib/string/string_io.h index e79d7fd28fe..556c33660ce 100644 --- a/contrib/string/string_io.h +++ b/contrib/string/string_io.h @@ -1,24 +1,25 @@ #ifndef STRING_IO_H #define STRING_IO_H -unsigned char* string_output(unsigned char *data, int size); -unsigned char* string_input(unsigned char *str, int size, int hdrsize, - int *rtn_size); -unsigned char* c_charout(int32 c); -unsigned char* c_textout(struct varlena * vlena); -unsigned char* c_varcharout(unsigned char *s); +unsigned char *string_output(unsigned char *data, int size); +unsigned char *string_input(unsigned char *str, int size, int hdrsize, + int *rtn_size); +unsigned char *c_charout(int32 c); +unsigned char *c_textout(struct varlena * vlena); +unsigned char *c_varcharout(unsigned char *s); #if 0 -struct varlena* c_textin(unsigned char *str); -int32* c_charin(unsigned char *str) +struct varlena *c_textin(unsigned char *str); +int32 * +c_charin(unsigned char *str) #endif #endif /* * Local Variables: - * tab-width: 4 - * c-indent-level: 4 - * c-basic-offset: 4 + * tab-width: 4 + * c-indent-level: 4 + * c-basic-offset: 4 * End: */ |