arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-16 04:49:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #912 from neheb/master

Browse Source 
Fix %m with MinGW and potentially OS X.
This commit is contained in:
Jens Steube 2016-12-07 12:24:45 +01:00 committed by GitHub
commit 2b24f60310
2 changed files with 15 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_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)))
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, ...);
__attribute__ ((format (gnu_printf, 2, 3)))
EVENT_PRINTF
size_t event_log_error_nn (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...);
__attribute__ ((format (printf, 2, 3)))
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, ...);
__attribute__ ((format (gnu_printf, 2, 3)))
EVENT_PRINTF
size_t event_log_error (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...);
int event_ctx_init (hashcat_ctx_t *hashcat_ctx);

6
src/event.c
View File

@ -53,10 +53,14 @@ 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)
{
#if defined (__MINGW32__)
return __mingw_vsnprintf (s, sz, fmt, ap);
#else
return vsnprintf (s, sz, fmt, ap);
#endif
}
size_t event_log_info_nn (hashcat_ctx_t *hashcat_ctx, const char *fmt, ...)