From 937f09dd3532a2033e9bf159bed842bfd1f3ad2a Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Fri, 30 Oct 2020 22:06:33 -0700 Subject: *: more minor cleanups No need for fflush(stderr) when it's already unbuffered by default. According to setvbuf(3): Normally all files are block buffered. If a stream refers to a terminal (as stdout normally does), it is line buffered. The standard error stream stderr is always unbuffered by default. --- src/rmd_cache_frame.c | 2 -- src/rmd_error.c | 7 ++----- src/rmd_timer.c | 6 +++--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/rmd_cache_frame.c b/src/rmd_cache_frame.c index a1cb669..3a4e9b3 100644 --- a/src/rmd_cache_frame.c +++ b/src/rmd_cache_frame.c @@ -262,7 +262,6 @@ void *rmdCacheImageBuffer(ProgData *pdata) if (rmdSwapCacheFilesWrite(pdata->cache_data->imgdata, nth_cache, &fp, &ucfp)) { fprintf(stderr, "New cache file could not be created.\n" "Ending recording...\n"); - fflush(stderr); raise(SIGINT); //if for some reason we cannot make a new file //we have to stop. If we are out of space, //which means @@ -309,7 +308,6 @@ void *rmdCacheImageBuffer(ProgData *pdata) fprintf(stderr, "Saved %d frames in a total of %d requests\n", frameno, capture_frameno); - fflush(stderr); if (!pdata->args.zerocompression) { gzflush(fp, Z_FINISH); diff --git a/src/rmd_error.c b/src/rmd_error.c index ba95198..aaef20a 100644 --- a/src/rmd_error.c +++ b/src/rmd_error.c @@ -41,17 +41,14 @@ int rmdErrorHandler(Display *dpy, XErrorEvent *e) XGetErrorText(dpy, e->error_code, error_desc, sizeof(error_desc)); fprintf(stderr, "X Error: %s\n", error_desc); - fflush(stderr); - if ((e->error_code==BadWindow)&&(e->request_code==X_GetWindowAttributes)) { + if ((e->error_code == BadWindow) && (e->request_code == X_GetWindowAttributes)) { fprintf(stderr, "BadWindow on XGetWindowAttributes.\nIgnoring...\n"); - fflush(stderr); return 0; } - if ((e->error_code==BadAccess)&&(e->request_code==X_GrabKey)) { + if ((e->error_code == BadAccess) && (e->request_code == X_GrabKey)) { fprintf(stderr, "Bad Access on XGrabKey.\n" "Shortcut already assigned.\n"); - fflush(stderr); return 0; } diff --git a/src/rmd_timer.c b/src/rmd_timer.c index ed49520..9936860 100644 --- a/src/rmd_timer.c +++ b/src/rmd_timer.c @@ -109,10 +109,10 @@ void *rmdTimer(ProgData *pdata) if (!pdata->paused) { pdata->paused = TRUE; - fprintf(stderr,"STATE:PAUSED\n");fflush(stderr); - } else{ + fprintf(stderr, "STATE:PAUSED\n"); + } else { pdata->paused = FALSE; - fprintf(stderr,"STATE:RECORDING\n");fflush(stderr); + fprintf(stderr, "STATE:RECORDING\n"); pthread_cond_broadcast(&pdata->pause_cond); } } -- cgit v1.2.1