avoid a possible sign-extension for offsets/sizes in SGI

[imager.git] / imerror.h

diff --git a/imerror.h b/imerror.h
index b51600ec21e0f61ca7753cd01f0869508e56158d..e1cfc943e79f3d76b8a7016d1f5f92b5db05e79c 100644 (file)
--- a/imerror.h
+++ b/imerror.h
@@ -5,26 +5,21 @@
    see error.c for documentation
    the error information is currently global
 */
    see error.c for documentation
    the error information is currently global
 */

-typedef struct {
-  char *msg;
-  int code;
-} i_errmsg;
-

 typedef void (*i_error_cb)(int code, char const *msg);
 typedef void (*i_failed_cb)(i_errmsg *msgs);
 extern i_error_cb i_set_error_cb(i_error_cb);
 extern i_failed_cb i_set_failed_cb(i_failed_cb);
 extern void i_set_argv0(char const *);
 extern int i_set_errors_fatal(int new_fatal);
 typedef void (*i_error_cb)(int code, char const *msg);
 typedef void (*i_failed_cb)(i_errmsg *msgs);
 extern i_error_cb i_set_error_cb(i_error_cb);
 extern i_failed_cb i_set_failed_cb(i_failed_cb);
 extern void i_set_argv0(char const *);
 extern int i_set_errors_fatal(int new_fatal);

-extern i_errmsg *i_errors(void);
+extern i_errmsg *im_errors(pIMCTX);

 
 extern void im_push_error(pIMCTX, int code, char const *msg);
 
 extern void im_push_error(pIMCTX, int code, char const *msg);

-#define i_push_error(code, msg) im_push_error(aIMCTX, code, msg)
+#ifndef IMAGER_NO_CONTEXT

 extern void i_push_errorf(int code, char const *fmt, ...) I_FORMAT_ATTR(2, 3);
 extern void i_push_errorf(int code, char const *fmt, ...) I_FORMAT_ATTR(2, 3);

+#endif

 extern void im_push_errorf(pIMCTX, int code, char const *fmt, ...) I_FORMAT_ATTR(3, 4);
 extern void im_push_errorf(pIMCTX, int code, char const *fmt, ...) I_FORMAT_ATTR(3, 4);

-extern void i_push_errorvf(int code, char const *fmt, va_list);
+extern void im_push_errorvf(im_context_t ctx, int code, char const *fmt, va_list);

 extern void im_clear_error(pIMCTX);
 extern void im_clear_error(pIMCTX);

-#define i_clear_error() im_clear_error(aIMCTX);

 extern int i_failed(int code, char const *msg);
 
 #endif
 extern int i_failed(int code, char const *msg);
 
 #endif