mirror of
https://github.com/hashcat/hashcat.git
synced 2024-12-23 23:19:09 +00:00
Merge pull request #912 from neheb/master
Fix %m with MinGW and potentially OS X.
This commit is contained in:
commit
2b24f60310
@ -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);
|
||||
|
@ -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, ...)
|
||||
|
Loading…
Reference in New Issue
Block a user