Changeset 185 for trunk/include/sh_string.h

Timestamp:

Oct 29, 2008, 8:59:18 PM (16 years ago)

Author:

katerina

Message:

Bugfixes for log monitoring, samba logfile parser.

File:

• trunk/include/sh_string.h (modified) (2 diffs)

trunk/include/sh_string.h

@@ -33 +33 @@
 
 #define sh_string_copy(a)  ((a) ? sh_string_new_from_lchar(((a)->str), ((a)->len)) : NULL)
-#define sh_string_add(a,b) ((a && b) ? sh_string_add_from_lchar((a), ((b)->str), ((b)->len)) : NULL)
+#define sh_string_add(a,b) ((a && b) ? sh_string_cat_lchar((a), ((b)->str), ((b)->len)) : NULL)
 
 /* create new sh_string from three arrays of given length
@@ -53 +53 @@
  */
 size_t sh_string_read(sh_string * s, FILE * fp, size_t maxlen);
+
+/* Read a string from a file, with maxlen. Return 0 on EOF,
+ * -1 on error, and -2 if a line exceeds maxlen.
+ * If 'cont' != NULL, continuation lines starting with a char
+ * in 'cont' are concatenated.
+ */
+size_t sh_string_read_cont(sh_string * s, FILE * fp, size_t maxlen, char *cont);
 
 /* Split array at delim in at most nfields fields.