diff options
author | kraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2000-10-25 16:40:21 +0000 |
---|---|---|
committer | kraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2000-10-25 16:40:21 +0000 |
commit | 2074e13dbe7fa441f95485ab3364e01d21437faf (patch) | |
tree | 142d6fd6c020d30bc3d7895072edb1ddc9a8600e /sysklogd/logger.c | |
parent | f5f7fb2ebbe6d5eb3757e58afd09c619acea7585 (diff) | |
download | busybox-w32-2074e13dbe7fa441f95485ab3364e01d21437faf.tar.gz busybox-w32-2074e13dbe7fa441f95485ab3364e01d21437faf.tar.bz2 busybox-w32-2074e13dbe7fa441f95485ab3364e01d21437faf.zip |
Clean up error handling and uses of TRUE/FALSE.
git-svn-id: svn://busybox.net/trunk/busybox@1237 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'sysklogd/logger.c')
-rw-r--r-- | sysklogd/logger.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/sysklogd/logger.c b/sysklogd/logger.c index fa1cf6d15..bd9eed9f6 100644 --- a/sysklogd/logger.c +++ b/sysklogd/logger.c | |||
@@ -80,19 +80,15 @@ static int pencode(char *s) | |||
80 | if (*s) { | 80 | if (*s) { |
81 | *s = '\0'; | 81 | *s = '\0'; |
82 | fac = decode(save, facilitynames); | 82 | fac = decode(save, facilitynames); |
83 | if (fac < 0) { | 83 | if (fac < 0) |
84 | errorMsg("unknown facility name: %s\n", save); | 84 | fatalError("unknown facility name: %s\n", save); |
85 | exit(FALSE); | ||
86 | } | ||
87 | *s++ = '.'; | 85 | *s++ = '.'; |
88 | } else { | 86 | } else { |
89 | s = save; | 87 | s = save; |
90 | } | 88 | } |
91 | lev = decode(s, prioritynames); | 89 | lev = decode(s, prioritynames); |
92 | if (lev < 0) { | 90 | if (lev < 0) |
93 | errorMsg("unknown priority name: %s\n", save); | 91 | fatalError("unknown priority name: %s\n", save); |
94 | exit(FALSE); | ||
95 | } | ||
96 | return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK)); | 92 | return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK)); |
97 | } | 93 | } |
98 | 94 | ||
@@ -149,17 +145,15 @@ extern int logger_main(int argc, char **argv) | |||
149 | } | 145 | } |
150 | message = buf; | 146 | message = buf; |
151 | } else { | 147 | } else { |
152 | if (argc >= 1) { | 148 | if (argc >= 1) |
153 | message = *argv; | 149 | message = *argv; |
154 | } else { | 150 | else |
155 | errorMsg("No message\n"); | 151 | fatalError("No message\n"); |
156 | exit(FALSE); | ||
157 | } | ||
158 | } | 152 | } |
159 | 153 | ||
160 | openlog(name, option, (pri | LOG_FACMASK)); | 154 | openlog(name, option, (pri | LOG_FACMASK)); |
161 | syslog(pri, message); | 155 | syslog(pri, message); |
162 | closelog(); | 156 | closelog(); |
163 | 157 | ||
164 | return(TRUE); | 158 | return EXIT_SUCCESS; |
165 | } | 159 | } |