diff --git a/src/calendar.c b/src/calendar.c index 8738ee34..9772bba3 100644 --- a/src/calendar.c +++ b/src/calendar.c @@ -1218,7 +1218,7 @@ static void PrintLeft(char const *s, int width, char pad) if (!buf) { /* Uh-oh... cannot recover */ fprintf(stderr, "%s\n", ErrMsg[E_NO_MEM]); - exit(1); + exit(EXIT_FAILURE); } } (void) mbstowcs(buf, s, len+1); @@ -1297,7 +1297,7 @@ static void PrintCentered(char const *s, int width, char *pad) if (!buf) { /* Uh-oh... cannot recover */ fprintf(stderr, "%s\n", ErrMsg[E_NO_MEM]); - exit(1); + exit(EXIT_FAILURE); } } (void) mbstowcs(buf, s, len+1); @@ -1603,7 +1603,7 @@ static void GenerateCalEntries(int col) r=IncludeFile(InitialFile); if (r) { fprintf(ErrFp, "%s %s: %s\n", ErrMsg[E_ERR_READING], InitialFile, ErrMsg[r]); - exit(1); + exit(EXIT_FAILURE); } while(1) { @@ -1611,7 +1611,7 @@ static void GenerateCalEntries(int col) if (r == E_EOF) return; if (r) { Eprint("%s: %s", ErrMsg[E_ERR_READING], ErrMsg[r]); - exit(1); + exit(EXIT_FAILURE); } s = FindInitialToken(&tok, CurLine); diff --git a/src/init.c b/src/init.c index c043f9f0..a479463c 100644 --- a/src/init.c +++ b/src/init.c @@ -229,7 +229,7 @@ void InitRemind(int argc, char const *argv[]) } } else { fprintf(stderr, "Invoked with a NULL argv[0]; bailing because that's just plain bizarre.\n"); - exit(1); + exit(EXIT_FAILURE); } /* Parse the command-line options */ @@ -1002,7 +1002,7 @@ ProcessLongOption(char const *arg) { if (!strcmp(arg, "version")) { printf("%s\n", VERSION); - exit(0); + exit(EXIT_SUCCESS); } fprintf(ErrFp, "%s: Unknown long option --%s\n", ArgV[0], arg); } diff --git a/src/main.c b/src/main.c index e9882996..d74cbc96 100644 --- a/src/main.c +++ b/src/main.c @@ -181,14 +181,14 @@ static void DoReminders(void) if (FileAccessDate < 0) { fprintf(ErrFp, "%s: `%s': %s.\n", ErrMsg[E_CANTACCESS], InitialFile, strerror(errno)); - exit(1); + exit(EXIT_FAILURE); } r=IncludeFile(InitialFile); if (r) { fprintf(ErrFp, "%s %s: %s\n", ErrMsg[E_ERR_READING], InitialFile, ErrMsg[r]); - exit(1); + exit(EXIT_FAILURE); } while(1) { @@ -196,7 +196,7 @@ static void DoReminders(void) if (r == E_EOF) return; if (r) { Eprint("%s: %s", ErrMsg[E_ERR_READING], ErrMsg[r]); - exit(1); + exit(EXIT_FAILURE); } s = FindInitialToken(&tok, CurLine); diff --git a/src/queue.c b/src/queue.c index dbe36dea..dbcab61e 100644 --- a/src/queue.c +++ b/src/queue.c @@ -256,7 +256,7 @@ void HandleQueuedReminders(void) if (!Daemon) { int y, m, d; if (RealToday != SystemDate(&y, &m, &d)) { - exit(0); + exit(EXIT_SUCCESS); } } @@ -323,7 +323,7 @@ void HandleQueuedReminders(void) } } } - exit(0); + exit(EXIT_SUCCESS); } @@ -611,16 +611,16 @@ static void DaemonWait(struct timeval *sleep_tv) /* If EOF on stdin, exit */ if (feof(stdin)) { - exit(0); + exit(EXIT_SUCCESS); } /* Read a line from stdin and interpret it */ if (!fgets(cmdLine, sizeof(cmdLine), stdin)) { - exit(0); + exit(EXIT_SUCCESS); } if (!strcmp(cmdLine, "EXIT\n")) { - exit(0); + exit(EXIT_SUCCESS); } else if (!strcmp(cmdLine, "STATUS\n")) { int nqueued = 0; QueuedRem *q = QueueHead; diff --git a/src/rem2ps.c b/src/rem2ps.c index de97baff..9e26fca7 100644 --- a/src/rem2ps.c +++ b/src/rem2ps.c @@ -186,19 +186,19 @@ JSONToCalEntry(DynamicBuffer *buf) val = json_parse(DBufValue(buf), DBufLen(buf)); if (!val) { fprintf(stderr, "Unable to parse JSON line `%s'\n", DBufValue(buf)); - exit(1); + exit(EXIT_FAILURE); } if (val->type != json_object) { fprintf(stderr, "Expecting JSON object; found `%s'\n", DBufValue(buf)); - exit(1); + exit(EXIT_FAILURE); } c = NEW(CalEntry); if (!c) { fprintf(stderr, "malloc failed - aborting.\n"); - exit(1); + exit(EXIT_FAILURE); } c->next = NULL; c->special = SPECIAL_NORMAL; @@ -221,7 +221,7 @@ JSONToCalEntry(DynamicBuffer *buf) c->entry = malloc(strlen(s)+1); if (!c->entry) { fprintf(stderr, "malloc failed - aborting.\n"); - exit(1); + exit(EXIT_FAILURE); } strcpy(c->entry, s); got_body = 1; @@ -253,7 +253,7 @@ JSONToCalEntry(DynamicBuffer *buf) if (!got_body || !got_date) { fprintf(stderr, "Could not parse line `%s'\n", DBufValue(buf)); - exit(1); + exit(EXIT_FAILURE); } return c; } @@ -272,7 +272,7 @@ TextToCalEntry(DynamicBuffer *buf) CalEntry *c = NEW(CalEntry); if (!c) { fprintf(stderr, "malloc failed - aborting.\n"); - exit(1); + exit(EXIT_FAILURE); } c->next = NULL; c->special = SPECIAL_NORMAL; @@ -296,7 +296,7 @@ TextToCalEntry(DynamicBuffer *buf) c->entry = malloc(strlen(startOfBody) + 1); if (!c->entry) { fprintf(stderr, "malloc failed - aborting.\n"); - exit(1); + exit(EXIT_FAILURE); } strcpy(c->entry, startOfBody); @@ -343,7 +343,7 @@ int main(int argc, char *argv[]) DBufGets(&buf, stdin); if (first_line && (!strcmp(DBufValue(&buf), "["))) { fprintf(stderr, "Rem2PS: It appears that you have invoked Remind with the -ppp option.\n Please use either -p or -pp, but not -ppp.\n"); - exit(1); + exit(EXIT_FAILURE); } first_line = 0; if (!strcmp(DBufValue(&buf), PSBEGIN) || @@ -361,7 +361,7 @@ int main(int argc, char *argv[]) if (!validfile) { fprintf(stderr, "Rem2PS: Couldn't find any calendar data - are you\n"); fprintf(stderr, " sure you fed me input produced by remind -p ...?\n"); - exit(1); + exit(EXIT_FAILURE); } printf("%%%%Trailer\n"); printf("%%%%Pages: %d\n", validfile); @@ -486,7 +486,7 @@ void DoPsCal(void) while(1) { if (feof(stdin)) { fprintf(stderr, "Input from REMIND is corrupt!\n"); - exit(1); + exit(EXIT_FAILURE); } DBufGets(&buf, stdin); @@ -952,7 +952,7 @@ void Init(int argc, char *argv[]) fprintf(stderr, " WxHin Specify size in inches (W and H are decimal numbers)\n"); fprintf(stderr, " WxHcm Specify size in centimetres (W and H are decimal numbers)\n"); fprintf(stderr, "Default media type is %s\n", DefaultPage[0].name); - exit(1); + exit(EXIT_FAILURE); } break; @@ -1033,7 +1033,7 @@ void Usage(char const *s) fprintf(stderr, "-e Make calendar fill entire page\n"); fprintf(stderr, "-x Put day numbers on left instead of right\n"); fprintf(stderr, "-o[lrtb] marg Specify left, right, top and bottom margins\n"); - exit(1); + exit(EXIT_FAILURE); } /***************************************************************/