diff options
Diffstat (limited to 'tbdiff/tbdiff-common.h')
| -rw-r--r-- | tbdiff/tbdiff-common.h | 87 |
1 files changed, 58 insertions, 29 deletions
diff --git a/tbdiff/tbdiff-common.h b/tbdiff/tbdiff-common.h index d4ac2c8..cbb5c0d 100644 --- a/tbdiff/tbdiff-common.h +++ b/tbdiff/tbdiff-common.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2012 Codethink Ltd. + * Copyright (C) 2011-2014 Codethink Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License Version 2 as @@ -24,6 +24,7 @@ #include <stdio.h> #include <stdint.h> +#include <stdarg.h> #include <tbdiff/tbdiff-stat.h> @@ -45,6 +46,8 @@ typedef enum { TBD_CMD_XATTRS_UPDATE = 0x60, } tbd_cmd_e; +typedef uint8_t tbd_cmd_t; + typedef enum { TBD_METADATA_NONE = 0x0, TBD_METADATA_MTIME = 0x1, @@ -55,49 +58,75 @@ typedef enum { } tbd_metadata_type_e; typedef enum { - TBD_ERROR_SUCCESS = 0, - TBD_ERROR_FAILURE = -1, - TBD_ERROR_OUT_OF_MEMORY = -2, - TBD_ERROR_NULL_POINTER = -3, - TBD_ERROR_INVALID_PARAMETER = -4, - TBD_ERROR_UNABLE_TO_READ_STREAM = -5, - TBD_ERROR_UNABLE_TO_WRITE_STREAM = -6, - TBD_ERROR_UNABLE_TO_CREATE_DIR = -7, - TBD_ERROR_UNABLE_TO_CHANGE_DIR = -8, - TBD_ERROR_UNABLE_TO_OPEN_FILE_FOR_READING = -9, - TBD_ERROR_UNABLE_TO_OPEN_FILE_FOR_WRITING = -10, - TBD_ERROR_FILE_ALREADY_EXISTS = -11, - TBD_ERROR_UNABLE_TO_REMOVE_FILE = -12, - TBD_ERROR_UNABLE_TO_SEEK_THROUGH_STREAM = -13, - TBD_ERROR_FEATURE_NOT_IMPLEMENTED = -14, - TBD_ERROR_FILE_DOES_NOT_EXIST = -15, + TBD_ERROR_SUCCESS = 0, + TBD_ERROR_FAILURE = -1, + TBD_ERROR_OUT_OF_MEMORY = -2, + TBD_ERROR_NULL_POINTER = -3, + TBD_ERROR_INVALID_PARAMETER = -4, + TBD_ERROR_UNABLE_TO_READ_STREAM = -5, + TBD_ERROR_UNABLE_TO_WRITE_STREAM = -6, + TBD_ERROR_UNABLE_TO_CREATE_DIR = -7, + TBD_ERROR_UNABLE_TO_CHANGE_DIR = -8, + TBD_ERROR_UNABLE_TO_OPEN_FILE_FOR_READING = -9, + TBD_ERROR_UNABLE_TO_OPEN_FILE_FOR_WRITING = -10, + TBD_ERROR_FILE_ALREADY_EXISTS = -11, + TBD_ERROR_UNABLE_TO_REMOVE_FILE = -12, + TBD_ERROR_UNABLE_TO_SEEK_THROUGH_STREAM = -13, + TBD_ERROR_FEATURE_NOT_IMPLEMENTED = -14, + TBD_ERROR_FILE_DOES_NOT_EXIST = -15, TBD_ERROR_UNABLE_TO_DETECT_STREAM_POSITION = -16, - TBD_ERROR_UNABLE_TO_STAT_FILE = -17, - TBD_ERROR_UNABLE_TO_READ_SYMLINK = -18, - TBD_ERROR_UNABLE_TO_CREATE_SYMLINK = -19, - TBD_ERROR_UNABLE_TO_READ_SPECIAL_FILE = -20, - TBD_ERROR_UNABLE_TO_CREATE_SPECIAL_FILE = -21, - TBD_ERROR_UNABLE_TO_CREATE_SOCKET_FILE = -22, - TBD_ERROR_XATTRS_NOT_SUPPORTED = -23, - TBD_ERROR_XATTRS_MISSING_ATTR = -24, + TBD_ERROR_UNABLE_TO_STAT_FILE = -17, + TBD_ERROR_UNABLE_TO_READ_SYMLINK = -18, + TBD_ERROR_UNABLE_TO_CREATE_SYMLINK = -19, + TBD_ERROR_UNABLE_TO_READ_SPECIAL_FILE = -20, + TBD_ERROR_UNABLE_TO_CREATE_SPECIAL_FILE = -21, + TBD_ERROR_UNABLE_TO_CREATE_SOCKET_FILE = -22, + TBD_ERROR_XATTRS_NOT_SUPPORTED = -23, + TBD_ERROR_XATTRS_MISSING_ATTR = -24, } tbd_error_e; #ifdef NDEBUG +#define TBD_DEBUG(d) +#define TBD_WARN(w) #define TBD_ERROR(e) (e) +#define TBD_DEBUGF(d, ...) +#define TBD_WARNF(w, ...) #else +#define TBD_DEBUG(d) \ + tbd_log("debug", "%s", __func__, __LINE__, __FILE__, d) +#define TBD_WARN(w) \ + tbd_log("warning", "%s", __func__, __LINE__, __FILE__, w) +#define TBD_DEBUGF(d, ...) \ + tbd_log("debug", d, __func__, __LINE__, __FILE__, __VA_ARGS__) +#define TBD_WARNF(w, ...) \ + tbd_log("warning", w, __func__, __LINE__, __FILE__, __VA_ARGS__) +static inline +tbd_log(char const *t, char const *s, char const *func, int line, + char const *file, ...) +{ + va_list args; + va_start(args, file); + + fprintf(stderr, "TBDiff %s '", t); + vfprintf(stderr, s, args); + fprintf(stderr, "' in function '%s' at line %d of file '%s'.\n", + func, line, file); + + va_end(args); +} + #define TBD_ERROR(e) tbd_error(e, #e, __func__, __LINE__, __FILE__) static inline tbd_error_e tbd_error(tbd_error_e e, char const *s, char const *func, int line, char const* file) { if (e != TBD_ERROR_SUCCESS) - fprintf(stderr, "TBDiff error '%s' in function '%s' at line %d " - "of file '%s'.\n", s, func, line, file); + tbd_log("error", "%s", func, line, file, s); return e; } #endif -extern int tbd_apply (FILE *stream); -extern int tbd_create(FILE *stream, tbd_stat_t *a, tbd_stat_t *b); +extern int tbd_apply (FILE *stream); +extern int tbd_create(FILE *stream, tbd_stat_t *a, tbd_stat_t *b); #endif /* !__TBDIFF_COMMON_H__ */ |