arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-02-26 22:33:00 +00:00
Code Issues Releases Wiki Activity

Only apply gnu_printf to MinGW

Browse Source
This commit is contained in:
Rosen Penev 2016-12-03 16:04:38 -08:00
parent 1d01105b95
commit f27675a0ec
No known key found for this signature in database
GPG Key ID: 8B5A63249D3D4CE7
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/event.h
View File

@ -14,18 +14,24 @@ void event_call (const u32 id, hashcat_ctx_t *hashcat_ctx, const void *buf, cons
#define EVENT(id) event_call ((id), hashcat_ctx, NULL, 0) #define EVENT(id) event_call ((id), hashcat_ctx, NULL, 0)
#define EVENT_DATA(id,buf,len) event_call ((id), hashcat_ctx, (buf), (len)) #define EVENT_DATA(id,buf,len) event_call ((id), hashcat_ctx, (buf), (len))
#if defined (__MINGW32__)
#define EVENT_PRINTF __attribute__ ((format (gnu_printf, 2, 3)))
#else
#define EVENT_PRINTF __attribute__ ((format (printf, 2, 3)))
#endif
__attribute__ ((format (printf, 2, 3))) __attribute__ ((format (printf, 2, 3)))
size_t event_log_info_nn (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...); size_t event_log_info_nn (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...);
__attribute__ ((format (gnu_printf, 2, 3))) EVENT_PRINTF
size_t event_log_warning_nn (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...); size_t event_log_warning_nn (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...);
__attribute__ ((format (gnu_printf, 2, 3))) EVENT_PRINTF
size_t event_log_error_nn (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...); size_t event_log_error_nn (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...);
__attribute__ ((format (printf, 2, 3))) __attribute__ ((format (printf, 2, 3)))
size_t event_log_info (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...); size_t event_log_info (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...);
__attribute__ ((format (gnu_printf, 2, 3))) EVENT_PRINTF
size_t event_log_warning (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...); size_t event_log_warning (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...);
__attribute__ ((format (gnu_printf, 2, 3))) EVENT_PRINTF
size_t event_log_error (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...); size_t event_log_error (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...);
int event_ctx_init (hashcat_ctx_t *hashcat_ctx); int event_ctx_init (hashcat_ctx_t *hashcat_ctx);

2
src/event.c
View File

@ -53,7 +53,7 @@ void event_call (const u32 id, hashcat_ctx_t *hashcat_ctx, const void *buf, cons
} }
} }
__attribute__ ((format (gnu_printf, 1, 0))) __attribute__ ((format (printf, 1, 0)))
static int event_log (const char *fmt, va_list ap, char *s, const size_t sz) static int event_log (const char *fmt, va_list ap, char *s, const size_t sz)
{ {
return vsnprintf (s, sz, fmt, ap); return vsnprintf (s, sz, fmt, ap);