comparison 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
comparison
equal deleted inserted replaced
957:b66653c9acb3 958:985225a93aeb
49 vfprintf(stderr, fmt, ap); 49 vfprintf(stderr, fmt, ap);
50 } 50 }
51 } 51 }
52 52
53 53
54 void dmErrorVA(const char *fmt, va_list ap)
55 {
56 fprintf(stderr, "%s: ", dmProgName);
57 vfprintf(stderr, fmt, ap);
58 }
59
60
61 void dmError(const char *fmt, ...)
62 {
63 va_list ap;
64
65 va_start(ap, fmt);
66 dmErrorVA(fmt, ap);
67 va_end(ap);
68 }
69
70
71 void dmMsg(int level, const char *fmt, ...) 54 void dmMsg(int level, const char *fmt, ...)
72 { 55 {
73 va_list ap; 56 va_list ap;
74 57
75 va_start(ap, fmt); 58 va_start(ap, fmt);
192 default: return "Unknown error"; 175 default: return "Unknown error";
193 } 176 }
194 } 177 }
195 178
196 179
180 int dmErrorVA(const int error, const char *fmt, va_list ap)
181 {
182 if (dmProgName != NULL)
183 fprintf(stderr, "%s: ", dmProgName);
184
185 vfprintf(stderr, fmt, ap);
186 return error;
187 }
188
189
190 int dmError(const int error, const char *fmt, ...)
191 {
192 int ret;
193 va_list ap;
194
195 va_start(ap, fmt);
196 ret = dmErrorVA(error, fmt, ap);
197 va_end(ap);
198 return ret;
199 }
200
201
202 void dmErrorMsg(const char *fmt, ...)
203 {
204 va_list ap;
205
206 va_start(ap, fmt);
207 dmErrorVA(DMERR_INTERNAL, fmt, ap);
208 va_end(ap);
209 }
210
211
212 /*
213 * Mutex debugging
214 */
197 #ifdef DM_MUTEX_DEBUG 215 #ifdef DM_MUTEX_DEBUG
198 216
199 static DMMutexLock * dmGetMutexThreadIDLock(DMMutex *mutex) 217 static DMMutexLock * dmGetMutexThreadIDLock(DMMutex *mutex)
200 { 218 {
201 Uint32 id = SDL_ThreadID(); 219 Uint32 id = SDL_ThreadID();