Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-03-11 18:30:22 +00:00
Code Issues Projects Releases Wiki Activity

Clean up error handling and uses of TRUE/FALSE.

Browse Source
This commit is contained in:
Matt Kraai 2000-10-25 16:40:21 +00:00
parent ac1169b20f
commit 3180413e76
2 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
logger.c
View File

@ -80,19 +80,15 @@ static int pencode(char *s)
if (*s) { if (*s) {
*s = '\0'; *s = '\0';
fac = decode(save, facilitynames); fac = decode(save, facilitynames);
if (fac < 0) { if (fac < 0)
errorMsg("unknown facility name: %s\n", save); fatalError("unknown facility name: %s\n", save);
exit(FALSE);
}
*s++ = '.'; *s++ = '.';
} else { } else {
s = save; s = save;
} }
lev = decode(s, prioritynames); lev = decode(s, prioritynames);
if (lev < 0) { if (lev < 0)
errorMsg("unknown priority name: %s\n", save); fatalError("unknown priority name: %s\n", save);
exit(FALSE);
}
return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK)); return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK));
} }
@ -149,17 +145,15 @@ extern int logger_main(int argc, char **argv)
} }
message = buf; message = buf;
} else { } else {
if (argc >= 1) { if (argc >= 1)
message = *argv; message = *argv;
} else { else
errorMsg("No message\n"); fatalError("No message\n");
exit(FALSE);
}
} }
openlog(name, option, (pri | LOG_FACMASK)); openlog(name, option, (pri | LOG_FACMASK));
syslog(pri, message); syslog(pri, message);
closelog(); closelog();
return(TRUE); return EXIT_SUCCESS;
} }

22
sysklogd/logger.c
View File

@ -80,19 +80,15 @@ static int pencode(char *s)
if (*s) { if (*s) {
*s = '\0'; *s = '\0';
fac = decode(save, facilitynames); fac = decode(save, facilitynames);
if (fac < 0) { if (fac < 0)
errorMsg("unknown facility name: %s\n", save); fatalError("unknown facility name: %s\n", save);
exit(FALSE);
}
*s++ = '.'; *s++ = '.';
} else { } else {
s = save; s = save;
} }
lev = decode(s, prioritynames); lev = decode(s, prioritynames);
if (lev < 0) { if (lev < 0)
errorMsg("unknown priority name: %s\n", save); fatalError("unknown priority name: %s\n", save);
exit(FALSE);
}
return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK)); return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK));
} }
@ -149,17 +145,15 @@ extern int logger_main(int argc, char **argv)
} }
message = buf; message = buf;
} else { } else {
if (argc >= 1) { if (argc >= 1)
message = *argv; message = *argv;
} else { else
errorMsg("No message\n"); fatalError("No message\n");
exit(FALSE);
}
} }
openlog(name, option, (pri | LOG_FACMASK)); openlog(name, option, (pri | LOG_FACMASK));
syslog(pri, message); syslog(pri, message);
closelog(); closelog();
return(TRUE); return EXIT_SUCCESS;
} }