Refactoring post: split long lines.

1 files changed, 18 insertions, 8 deletions

diff --git a/pw.c b/pw.c
index fb7590f..cb3e2be 100644
--- a/pw.c
+++ b/pw.c
@@ -923,7 +923,8 @@ int main(int argc, char **argv)
         if (line) {
           if (pw.nlines == maxlines) {
             dsdrop(pw.circbuf[0]);
-            memmove(pw.circbuf, pw.circbuf + 1, (pw.nlines - 1) * sizeof *pw.circbuf);
+            memmove(pw.circbuf, pw.circbuf + 1,
+                    (pw.nlines - 1) * sizeof *pw.circbuf);
             pw.circbuf[pw.nlines - 1] = line;
             pw.stat |= stat_dirty;
             if ((pw.stat & stat_ttmode)) {
@@ -940,7 +941,9 @@ int main(int argc, char **argv)
                 pw.stat |= stat_trgrd;
             } else if ((pw.stat & stat_htmode)) {
               int trig = 1;
-              for (int j = pw.nlines - 1, i = 0; j >= 0 && i < maxtrig; j--, i++) {
+              for (int j = pw.nlines- 1, i = 0; j >= 0 && i < maxtrig;
+                   j--, i++)
+              {
                 grep *gr = triglist[i];
                 if (gr && !grexec(gr, pw.circbuf[j])) {
                   trig = 0;
@@ -953,7 +956,8 @@ int main(int argc, char **argv)
           } else {
             pw.circbuf[pw.nlines++] = line;
             if ((pw.stat & (stat_susp | stat_bkgnd)) == 0) {
-              snapshot[0] = resizebuf(snapshot[0], snaplines[0], snaplines[0] + 1);
+              snapshot[0] = resizebuf(snapshot[0], snaplines[0],
+                                      snaplines[0] + 1);
               snapshot[0][snaplines[0]++] = dsref(line);
               clrline(pw.stat);
               drawline(&pw, line, (pw.stat & stat_lino) ? 0: -1);
@@ -1269,7 +1273,7 @@ int main(int argc, char **argv)
                                 &cmdhist : &pathist);
 
                 if (nhist == 0 || strcmp(pw.cmdbuf, (*hist)[0]) != 0) {
-                  if ((*hist = realloc(*hist, sizeof **hist * (nhist + 1))) == 0)
+                  if ((*hist = realloc(*hist, sizeof **hist*(nhist + 1))) == 0)
                     panic("out of memory");
                   memmove(*hist + 1, *hist, sizeof **hist * nhist);
                   *pnhist = nhist + 1;
@@ -1283,7 +1287,9 @@ int main(int argc, char **argv)
                   kbd_state = kbd_result;
                   break;
                 }
-              } else if (kbd_state == kbd_trig && (int) trig < maxlines && trig < maxtrig) {
+              } else if (kbd_state == kbd_trig &&
+                         (int) trig < maxlines && trig < maxtrig)
+              {
                 char *rx = pw.cmdbuf + 1;
                 int inv = 0;
                 grep *gr = 0;
@@ -1297,8 +1303,11 @@ int main(int argc, char **argv)
 
                 char *pat = dsdup(rx);
 
-                if (*pat && (gr = grnew(dsref(pat), inv, dsdrop), grerr(gr) != 0)) {
-                  grerrstr(gr, pw.cmdbuf, min(pw.columns, (int) sizeof pw.cmdbuf));
+                if (*pat && (gr = grnew(dsref(pat), inv, dsdrop),
+                             grerr(gr) != 0))
+                {
+                  grerrstr(gr, pw.cmdbuf,
+                           min(pw.columns, (int) sizeof pw.cmdbuf));
                   grfree(gr);
                   kbd_state = kbd_result;
                 } else {
@@ -1321,7 +1330,8 @@ int main(int argc, char **argv)
                 pw.stat &= ~(stat_htmode | stat_ttmode);
                 for (int i = 0; i < maxtrig; i++) {
                   if (triglist[i]) {
-                    pw.stat |= (pw.cmdbuf[0] == '/' ? stat_htmode : stat_ttmode);
+                    pw.stat |= (pw.cmdbuf[0] == '/'
+                                ? stat_htmode : stat_ttmode);
                     break;
                   }
                 }