if ((level & LOG_FACMASK) == 0)
level = log_facility | LOG_PRI(level);
+ if (error < 0)
+ error = -error;
+
do {
char *e;
int k = 0;
return log_dispatch(level, error, file, line, func, NULL, NULL, buffer);
}
-int log_metav(
+int log_internalv(
int level,
int error,
const char*file,
/* Make sure that %m maps to the specified error */
if (error != 0)
- errno = error;
+ errno = abs(error);
vsnprintf(buffer, sizeof(buffer), format, ap);
char_array_0(buffer);
return log_dispatch(level, error, file, line, func, NULL, NULL, buffer);
}
-int log_meta(
+int log_internal(
int level,
int error,
const char*file,
va_list ap;
va_start(ap, format);
- r = log_metav(level, error, file, line, func, format, ap);
+ r = log_internalv(level, error, file, line, func, format, ap);
va_end(ap);
return r;
}
-int log_metav_object(
+int log_object_internalv(
int level,
int error,
const char*file,
/* Make sure that %m maps to the specified error */
if (error != 0)
- errno = error;
+ errno = abs(error);
vsnprintf(buffer, sizeof(buffer), format, ap);
char_array_0(buffer);
return log_dispatch(level, error, file, line, func, object_field, object, buffer);
}
-int log_meta_object(
+int log_object_internal(
int level,
int error,
const char*file,
va_list ap;
va_start(ap, format);
- r = log_metav_object(level, error, file, line, func, object_field, object, format, ap);
+ r = log_object_internalv(level, error, file, line, func, object_field, object, format, ap);
va_end(ap);
return r;
}
int log_oom_internal(const char *file, int line, const char *func) {
- log_meta(LOG_ERR, ENOMEM, file, line, func, "Out of memory.");
+ log_internal(LOG_ERR, ENOMEM, file, line, func, "Out of memory.");
return -ENOMEM;
}
if ((level & LOG_FACMASK) == 0)
level = log_facility | LOG_PRI(level);
+ if (error < 0)
+ error = -error;
+
if ((log_target == LOG_TARGET_AUTO ||
log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
log_target == LOG_TARGET_JOURNAL) &&