Changeset 2965 for pjproject

Timestamp:

Oct 25, 2009 8:46:40 AM (15 years ago)

Author:

bennylp

Message:

Ticket #981: new pj_perror() utility API

Location:

pjproject/trunk/pjlib

Files:

• include/pj/errno.h (modified) (1 diff)
• src/pj/errno.c (modified) (2 diffs)

pjproject/trunk/pjlib/include/pj/errno.h

@@ -111 +111 @@
 PJ_DECL(pj_str_t) pj_strerror( pj_status_t statcode, 
                                char *buf, pj_size_t bufsize);
+
+/**
+ * Print the error message pertaining to the specified error code to
+ * the log.
+ *
+ * @param log_level The log will be printed at this log level.
+ * @param sender    The log sender string.
+ * @param status    The error code which error message will be printed.
+ * @param title     String to be printed before the error message. Note
+ *                  that a colon will be added automatically between
+ *                  this string and the error message.
+ * @param options   Options, currently must be zero.
+ */
+#if PJ_LOG_MAX_LEVEL >= 1
+PJ_DECL(void) pj_perror(int log_level, const char *sender, 
+                        pj_status_t status, const char *title,
+                        int options);
+#else
+#   define pj_perror(level, sender, status, title, options)
+#endif  /* #if PJ_LOG_MAX_LEVEL >= 1 */
+
 
 /**

pjproject/trunk/pjlib/src/pj/errno.c

@@ -19 +19 @@
  */
 #include <pj/errno.h>
+#include <pj/log.h>
 #include <pj/string.h>
 #include <pj/compat/string.h>
+#include <pj/compat/stdarg.h>
 #include <pj/assert.h>
 
@@ -197 +199 @@
 }
 
+#if PJ_LOG_MAX_LEVEL >= 1
+static void call_logger(const char *sender, int level, const char *format, ...)
+{
+    va_list arg;
+    va_start(arg, format);
+    pj_log(sender, level, format, arg);
+    va_end(arg);
+}
+
+/*
+ * perror()
+ */
+PJ_DEF(void) pj_perror(int log_level, const char *sender, 
+                       pj_status_t status, const char *title,
+                       int options)
+{
+    char errmsg[PJ_ERR_MSG_SIZE];
+
+    PJ_ASSERT_ON_FAIL(options==0, return);
+    PJ_UNUSED_ARG(options);
+
+    pj_strerror(status, errmsg, sizeof(errmsg));
+    call_logger(sender, log_level, "%s: %s", title, errmsg);
+}
+#endif  /* #if PJ_LOG_MAX_LEVEL >= 1 */
+
+