Merge in DIV0 changes and compiler warning suppression from trunk.

This commit is contained in:
brectanus
2007-03-07 16:24:45 +00:00
parent 0edf943d25
commit 600c071f37
4 changed files with 21 additions and 9 deletions

View File

@@ -428,23 +428,23 @@ unsigned char *c2x(unsigned what, unsigned char *where) {
}
char *log_escape(apr_pool_t *mp, const char *text) {
return _log_escape(mp, text, strlen(text), 1, 0);
return _log_escape(mp, (const unsigned char *)text, text ? strlen(text) : 0, 1, 0);
}
char *log_escape_nq(apr_pool_t *mp, const char *text) {
return _log_escape(mp, text, strlen(text), 0, 0);
return _log_escape(mp, (const unsigned char *)text, text ? strlen(text) : 0, 0, 0);
}
char *log_escape_ex(apr_pool_t *mp, const char *text, unsigned long int text_length) {
return _log_escape(mp, text, text_length, 1, 0);
return _log_escape(mp, (const unsigned char *)text, text_length, 1, 0);
}
char *log_escape_nq_ex(apr_pool_t *mp, const char *text, unsigned long int text_length) {
return _log_escape(mp, text, text_length, 0, 0);
return _log_escape(mp, (const unsigned char *)text, text_length, 0, 0);
}
char *log_escape_header_name(apr_pool_t *mp, const char *text) {
return _log_escape(mp, text, strlen(text), 0, 1);
return _log_escape(mp, (const unsigned char *)text, text ? strlen(text) : 0, 0, 1);
}
/**