return fails != 0 ? 1 : 0;
}
/* Stubs to stop the rest of this module causing compile failures. */
-void modalfatalbox(char *fmt, ...) {}
+void modalfatalbox(const char *fmt, ...) {}
int conf_get_int(Conf *conf, int primary) { return 0; }
char *conf_get_str(Conf *conf, int primary) { return NULL; }
#endif /* TEST_HOST_STRFOO */
return ret;
}
+/*
+ * Perl-style 'chomp', for a line we just read with fgetline. Unlike
+ * Perl chomp, however, we're deliberately forgiving of strange
+ * line-ending conventions. Also we forgive NULL on input, so you can
+ * just write 'line = chomp(fgetline(fp));' and not bother checking
+ * for NULL until afterwards.
+ */
+char *chomp(char *str)
+{
+ if (str) {
+ int len = strlen(str);
+ while (len > 0 && (str[len-1] == '\r' || str[len-1] == '\n'))
+ len--;
+ str[len] = '\0';
+ }
+ return str;
+}
+
/* ----------------------------------------------------------------------
* Core base64 encoding and decoding routines.
*/
-void base64_encode_atom(unsigned char *data, int n, char *out)
+void base64_encode_atom(const unsigned char *data, int n, char *out)
{
static const char base64_chars[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
out[3] = '=';
}
-int base64_decode_atom(char *atom, unsigned char *out)
+int base64_decode_atom(const char *atom, unsigned char *out)
{
int vals[4];
int i, v, len;
#else
strcpy(str, "Out of memory!");
#endif
- modalfatalbox(str);
+ modalfatalbox("%s", str);
}
#ifdef MALLOC_LOG
if (fp)
#else
strcpy(str, "Out of memory!");
#endif
- modalfatalbox(str);
+ modalfatalbox("%s", str);
}
#ifdef MALLOC_LOG
if (fp)
*/
#ifdef DEBUG
-extern void dputs(char *); /* defined in per-platform *misc.c */
+extern void dputs(const char *); /* defined in per-platform *misc.c */
-void debug_printf(char *fmt, ...)
+void debug_printf(const char *fmt, ...)
{
char *buf;
va_list ap;
}
-void debug_memdump(void *buf, int len, int L)
+void debug_memdump(const void *buf, int len, int L)
{
int i;
- unsigned char *p = buf;
+ const unsigned char *p = buf;
char foo[17];
if (L) {
int delta;