multiprogress.c: Remove pointless return value from `setup_render_state'.
authorMark Wooding <mdw@distorted.org.uk>
Fri, 25 Mar 2022 01:02:33 +0000 (01:02 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 25 Mar 2022 18:51:47 +0000 (18:51 +0000)
It's being checked, and, indeed, passed on.  But it didn't actually do
very much other than prevent the terminal-width fallback logic from
being useful.  So delete it.

multiprogress.c

index 724631d..f63eaa6 100644 (file)
@@ -174,12 +174,11 @@ int progress_removeitem(struct progress_state *progress,
   return (0);
 }
 
-static int setup_render_state(struct progress_state *progress,
-                             struct progress_render_state *render)
+static void setup_render_state(struct progress_state *progress,
+                              struct progress_render_state *render)
 {
   const struct progress_ttyinfo *tty = &progress->tty;
   struct winsize wsz;
-  int rc = 0;
 
   render->tty = tty;
   render->linebuf = 0; render->linesz = 0;
@@ -194,11 +193,9 @@ static int setup_render_state(struct progress_state *progress,
   if (!ioctl(fileno(tty->fp), TIOCGWINSZ, &wsz))
     { render->width = wsz.ws_col; render->height = wsz.ws_row; }
   else
-    { render->width = tty->defwd; render->height = tty->defht; rc = -1; }
+    { render->width = tty->defwd; render->height = tty->defht; }
 
   if (render->width && !tty->cap.op && !tty->cap.mr) render->width--;
-
-  return (rc);
 }
 
 static void free_render_state(struct progress_render_state *render)
@@ -442,7 +439,7 @@ int progress_clear(struct progress_state *progress)
   struct progress_render_state render;
 
   if (!progress->tty.fp) return (-1);
-  if (setup_render_state(progress, &render)) return (-1);
+  setup_render_state(progress, &render);
   clear_progress(progress, &render, CLRF_ALL);
   free_render_state(&render);
   return (0);
@@ -457,7 +454,7 @@ int progress_update(struct progress_state *progress)
 #define f_any 1u
 
   if (!progress->tty.fp) return (-1);
-  if (setup_render_state(progress, &render)) return (-1);
+  setup_render_state(progress, &render);
   clear_progress(progress, &render, 0);
 
   for (item = progress->items; item; item = item->next) {