Convert almost all remaining unsigned int.

1 files changed, 27 insertions, 28 deletions

diff --git a/pw.c b/pw.c
index 5dddef3..307863f 100644
--- a/pw.c
+++ b/pw.c
@@ -1034,10 +1034,9 @@ int main(int argc, char **argv)
   sigaction(SIGWINCH, &sa, NULL);
 #endif
 
-  for (unsigned kbd_state = kbd_cmd, kbd_prev = kbd_cmd, lasttime = ~0U,
-                workbout = 1024, work = workbout, histpos = 0,
-                cmdcount = UINT_MAX;
+  for (int kbd_state = kbd_cmd, kbd_prev = kbd_cmd, lasttime = -1,
        workbout = workmax, work = workbout, histpos = 0,
+       cmdcount = INT_MAX;
        kbd_state != kbd_exit ;)
   {
     int force = 0, nfds = 2, pollms = poll_interval;
@@ -1195,11 +1194,11 @@ int main(int argc, char **argv)
     if ((pw.stat & (stat_bkgnd | stat_susp)) == 0) {
       if (!force) {
         struct timeval tv;
-        unsigned now;
+        int now;
 
         gettimeofday(&tv, NULL);
-        now = (((unsigned) tv.tv_sec)%1000000)*1000 + tv.tv_usec/1000;
-        if (lasttime == ~0U || now - lasttime > (unsigned) long_interval) {
+        now = tv.tv_sec % 1000000 * 1000 + tv.tv_usec / 1000;
+        if (lasttime == -1 || now - lasttime > long_interval) {
           if ((pw.stat & stat_dirty) && pw.nlines == maxlines)
             force = 1;
           lasttime = now;
@@ -1260,36 +1259,36 @@ int main(int argc, char **argv)
             }
             break;
           case 'h':
-            if (cmdcount == UINT_MAX)
+            if (cmdcount == INT_MAX)
               cmdcount = 8;
-            if (pw.hpos >= (int) cmdcount)
+            if (pw.hpos >= cmdcount)
               pw.hpos -= cmdcount;
             else
               pw.hpos = 0;
             pw.stat |= stat_force;
             break;
           case 'l':
-            if (cmdcount == UINT_MAX)
+            if (cmdcount == INT_MAX)
               cmdcount = 8;
             if ((size_t) pw.hpos < maxlen)
               pw.hpos += cmdcount;
             pw.stat |= stat_force;
             break;
           case '>':
-            if (cmdcount == UINT_MAX)
+            if (cmdcount == INT_MAX)
               cmdcount = 1;
             pw.vsplit1 += cmdcount;
             clipsplits(&pw);
             pw.stat |= stat_force;
             break;
           case '<':
-            if (cmdcount == UINT_MAX)
+            if (cmdcount == INT_MAX)
               cmdcount = 1;
-            pw.vsplit1 = max(0, pw.vsplit1 - (int) cmdcount);
+            pw.vsplit1 = max(0, pw.vsplit1 - cmdcount);
             pw.stat |= stat_force;
             break;
           case ']':
-            if (cmdcount == UINT_MAX)
+            if (cmdcount == INT_MAX)
               cmdcount = 1;
             if (pw.vsplit2 == 0)
               pw.vs2pos = pw.hpos + pw.vsplit1;
@@ -1298,21 +1297,21 @@ int main(int argc, char **argv)
             pw.stat |= stat_force;
             break;
           case '[':
-            if (cmdcount == UINT_MAX)
+            if (cmdcount == INT_MAX)
               cmdcount = 1;
-            pw.vsplit2 = max(0, pw.vsplit2 - (int) cmdcount);
+            pw.vsplit2 = max(0, pw.vsplit2 - cmdcount);
             pw.stat |= stat_force;
             break;
           case '}':
-            if (cmdcount == UINT_MAX)
+            if (cmdcount == INT_MAX)
               cmdcount = 1;
-            pw.vs2pos = min((int) maxlen, pw.vs2pos + (int) cmdcount);
+            pw.vs2pos = min((int) maxlen, pw.vs2pos + cmdcount);
             pw.stat |= stat_force;
             break;
           case '{':
-            if (cmdcount == UINT_MAX)
+            if (cmdcount == INT_MAX)
               cmdcount = 1;
-            pw.vs2pos = max(0, pw.vs2pos - (int) cmdcount);
+            pw.vs2pos = max(0, pw.vs2pos - cmdcount);
             pw.stat |= stat_force;
             break;
           case ctrl('i'):
@@ -1362,7 +1361,7 @@ int main(int argc, char **argv)
                            ((pw.stat & stat_ttmode) && ch == 'd'))
                           ? -1 : 1);
 
-              if (cmdcount == UINT_MAX)
+              if (cmdcount == INT_MAX)
                 cmdcount = 1;
 
               if (step < 0) {
@@ -1388,7 +1387,7 @@ int main(int argc, char **argv)
             if (pw.hist > 0 || (ws.ws_row && maxlines >= ws.ws_row - 1)) {
               break;
             } else {
-              unsigned count = (cmdcount == UINT_MAX) ? 1 : cmdcount;
+              int count = (cmdcount == INT_MAX) ? 1 : cmdcount;
 
               maxlines += count;
 
@@ -1421,7 +1420,7 @@ int main(int argc, char **argv)
             kbd_state = kbd_result;
             break;
           case '0':
-            if (cmdcount == UINT_MAX) {
+            if (cmdcount == INT_MAX) {
               pw.hpos = 0;
               pw.stat |= stat_force;
               break;
@@ -1429,13 +1428,13 @@ int main(int argc, char **argv)
             // fallthrough
           default:
             if (isdigit(ch)) {
-              if (cmdcount == UINT_MAX)
+              if (cmdcount == INT_MAX)
                 cmdcount = 0;
               cmdcount = (cmdcount * 10 + (ch - '0')) % 1000;
             }
           }
           if (kbd_state == kbd_cmd && !isdigit(ch))
-            cmdcount = UINT_MAX;
+            cmdcount = INT_MAX;
           break;
         case kbd_esc:
           if (ch == '[') {
@@ -1482,7 +1481,7 @@ int main(int argc, char **argv)
             break;
           case CR: case ctrl('c'):
             if (ch == CR) {
-              int trig = (cmdcount == UINT_MAX || cmdcount == 0
+              int trig = (cmdcount == INT_MAX || cmdcount == 0
                           ? 0 : cmdcount - 1);
               if (pw.cmdbuf[1]) {
                 int *pnhist = (kbd_state == kbd_colon ? &ncmdhist : &npathist);
@@ -1558,7 +1557,7 @@ int main(int argc, char **argv)
 
             kbd_state = kbd_cmd;
             pw.curcmd = 0;
-            cmdcount = UINT_MAX;
+            cmdcount = INT_MAX;
             break;
           case BS: case DEL:
             {
@@ -1566,7 +1565,7 @@ int main(int argc, char **argv)
               if (len == 1) {
                 kbd_state = kbd_cmd;
                 pw.curcmd = 0;
-                // cmdcount deliberately not reset to UNIT_MAX
+                // cmdcount deliberately not reset to INT_MAX
               } else {
                 pw.cmdbuf[--len] = 0;
               }
@@ -1588,7 +1587,7 @@ int main(int argc, char **argv)
           case ctrl('p'):
           case ctrl('n'):
             {
-              unsigned nhist = (kbd_state == kbd_colon ? ncmdhist : npathist);
+              int nhist = (kbd_state == kbd_colon ? ncmdhist : npathist);
               char ***hist = (kbd_state == kbd_colon ? &cmdhist : &pathist);
 
               if (ch == ctrl('p')) {