Mercurial > hg > dmlib
diff src/dmlib.c @ 958:985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Fri, 27 Feb 2015 03:58:25 +0200 |
parents | b66653c9acb3 |
children | ada47e30d0c9 |
line wrap: on
line diff
--- a/src/dmlib.c Fri Feb 27 02:21:57 2015 +0200 +++ b/src/dmlib.c Fri Feb 27 03:58:25 2015 +0200 @@ -51,23 +51,6 @@ } -void dmErrorVA(const char *fmt, va_list ap) -{ - fprintf(stderr, "%s: ", dmProgName); - vfprintf(stderr, fmt, ap); -} - - -void dmError(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - dmErrorVA(fmt, ap); - va_end(ap); -} - - void dmMsg(int level, const char *fmt, ...) { va_list ap; @@ -194,6 +177,41 @@ } +int dmErrorVA(const int error, const char *fmt, va_list ap) +{ + if (dmProgName != NULL) + fprintf(stderr, "%s: ", dmProgName); + + vfprintf(stderr, fmt, ap); + return error; +} + + +int dmError(const int error, const char *fmt, ...) +{ + int ret; + va_list ap; + + va_start(ap, fmt); + ret = dmErrorVA(error, fmt, ap); + va_end(ap); + return ret; +} + + +void dmErrorMsg(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + dmErrorVA(DMERR_INTERNAL, fmt, ap); + va_end(ap); +} + + +/* + * Mutex debugging + */ #ifdef DM_MUTEX_DEBUG static DMMutexLock * dmGetMutexThreadIDLock(DMMutex *mutex)