aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkinichiro <kinichiro.inoguchi@gmail.com>2018-01-06 00:28:49 +0900
committerBrent Cook <bcook@openbsd.org>2018-01-07 16:23:41 -0600
commit90898c96868189449e7bb38e768cf977b07ed436 (patch)
tree28034d8fb3868e4fedbcdf20c045410fbec74569
parent339074b9241f6740df2711c03eab7fbf3f9dcb8d (diff)
downloadportable-90898c96868189449e7bb38e768cf977b07ed436.tar.gz
portable-90898c96868189449e7bb38e768cf977b07ed436.tar.bz2
portable-90898c96868189449e7bb38e768cf977b07ed436.zip
Call va_end soon after using variable length variable
- This fix MSVC compiler warning C4702 "unreachable code".
-rw-r--r--include/compat/err.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/compat/err.h b/include/compat/err.h
index 3a5e01f..8b5b635 100644
--- a/include/compat/err.h
+++ b/include/compat/err.h
@@ -34,9 +34,9 @@ err(int eval, const char *fmt, ...)
34 vfprintf(stderr, fmt, ap); 34 vfprintf(stderr, fmt, ap);
35 fprintf(stderr, ": "); 35 fprintf(stderr, ": ");
36 } 36 }
37 va_end(ap);
37 fprintf(stderr, "%s\n", strerror(sverrno)); 38 fprintf(stderr, "%s\n", strerror(sverrno));
38 exit(eval); 39 exit(eval);
39 va_end(ap);
40} 40}
41 41
42#if defined(_MSC_VER) 42#if defined(_MSC_VER)
@@ -52,9 +52,9 @@ errx(int eval, const char *fmt, ...)
52 va_start(ap, fmt); 52 va_start(ap, fmt);
53 if (fmt != NULL) 53 if (fmt != NULL)
54 vfprintf(stderr, fmt, ap); 54 vfprintf(stderr, fmt, ap);
55 va_end(ap);
55 fprintf(stderr, "\n"); 56 fprintf(stderr, "\n");
56 exit(eval); 57 exit(eval);
57 va_end(ap);
58} 58}
59 59
60static inline void 60static inline void
@@ -68,8 +68,8 @@ warn(const char *fmt, ...)
68 vfprintf(stderr, fmt, ap); 68 vfprintf(stderr, fmt, ap);
69 fprintf(stderr, ": "); 69 fprintf(stderr, ": ");
70 } 70 }
71 fprintf(stderr, "%s\n", strerror(sverrno));
72 va_end(ap); 71 va_end(ap);
72 fprintf(stderr, "%s\n", strerror(sverrno));
73} 73}
74 74
75static inline void 75static inline void
@@ -80,8 +80,8 @@ warnx(const char *fmt, ...)
80 va_start(ap, fmt); 80 va_start(ap, fmt);
81 if (fmt != NULL) 81 if (fmt != NULL)
82 vfprintf(stderr, fmt, ap); 82 vfprintf(stderr, fmt, ap);
83 fprintf(stderr, "\n");
84 va_end(ap); 83 va_end(ap);
84 fprintf(stderr, "\n");
85} 85}
86 86
87#endif 87#endif