… oh well, but MidnightBSD gcc picks on "" too, so just stick to NULL, it’s cheapest

This commit is contained in:
tg 2012-11-30 19:58:48 +00:00
parent 0f46c5e321
commit f63bcae02c
2 changed files with 6 additions and 6 deletions

4
main.c
View File

@ -34,7 +34,7 @@
#include <locale.h> #include <locale.h>
#endif #endif
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.244 2012/11/30 19:51:24 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/main.c,v 1.245 2012/11/30 19:58:47 tg Exp $");
extern char **environ; extern char **environ;
@ -1135,7 +1135,7 @@ static void vwarningf(unsigned int, const char *, va_list)
static void static void
vwarningf(unsigned int flags, const char *fmt, va_list ap) vwarningf(unsigned int flags, const char *fmt, va_list ap)
{ {
if (*fmt) { if (fmt) {
if (flags & VWARNINGF_INTERNAL) if (flags & VWARNINGF_INTERNAL)
shf_fprintf(shl_out, "internal error: "); shf_fprintf(shl_out, "internal error: ");
if (flags & VWARNINGF_ERRORPREFIX) if (flags & VWARNINGF_ERRORPREFIX)

8
sh.h
View File

@ -157,7 +157,7 @@
#endif #endif
#ifdef EXTERN #ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.607 2012/11/30 19:57:35 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.608 2012/11/30 19:58:48 tg Exp $");
#endif #endif
#define MKSH_VERSION "R41 2012/11/30" #define MKSH_VERSION "R41 2012/11/30"
@ -1829,9 +1829,9 @@ void warningf(bool, const char *, ...)
MKSH_A_FORMAT(__printf__, 2, 3); MKSH_A_FORMAT(__printf__, 2, 3);
void bi_errorf(const char *, ...) void bi_errorf(const char *, ...)
MKSH_A_FORMAT(__printf__, 1, 2); MKSH_A_FORMAT(__printf__, 1, 2);
#define errorfz() errorf("") #define errorfz() errorf(NULL)
#define errorfxz(rc) errorfx((rc), "") #define errorfxz(rc) errorfx((rc), NULL)
#define bi_errorfz() bi_errorf("") #define bi_errorfz() bi_errorf(NULL)
void internal_errorf(const char *, ...) void internal_errorf(const char *, ...)
MKSH_A_NORETURN MKSH_A_NORETURN
MKSH_A_FORMAT(__printf__, 1, 2); MKSH_A_FORMAT(__printf__, 1, 2);