Nuke most unsigned int.

1 files changed, 22 insertions, 23 deletions

diff --git a/pw.c b/pw.c
index 996c0ba..6e7682e 100644
--- a/pw.c
+++ b/pw.c
@@ -83,9 +83,9 @@ enum status_flags {
 typedef struct pwstate {
   char **circbuf;
   int nlines;
-  unsigned hpos;
-  unsigned vsplit1, vsplit2, vs2pos;
-  unsigned hist;
+  int hpos;
+  int vsplit1, vsplit2, vs2pos;
+  int hist;
   int columns;
   unsigned stat;
   char *curcmd, *savedcmd;
@@ -122,10 +122,10 @@ static int ngrep;
 static grep *triglist[maxtrig];
 
 static char **cmdhist;
-static unsigned ncmdhist;
+static int ncmdhist;
 
 static char **pathist;
-static unsigned npathist;
+static int npathist;
 
 volatile sig_atomic_t winch;
 
@@ -364,11 +364,11 @@ static void hlchar(pwstate *pw, int ch)
 static void drawline(pwstate *pw, const char *line, int lineno)
 {
   const char *oline = line;
-  size_t olen = dslen(line), len = olen;
+  int olen = (int) dslen(line), len = olen;
   int columns = pw->columns;
-  unsigned vsplit1 = pw->vsplit1;
-  unsigned vsplit2 = pw->vsplit2;
-  unsigned vs2pos = pw->vs2pos;
+  int vsplit1 = pw->vsplit1;
+  int vsplit2 = pw->vsplit2;
+  int vs2pos = pw->vs2pos;
   int endmark = 0;
 
   if (lineno >= 0)
@@ -380,16 +380,16 @@ static void drawline(pwstate *pw, const char *line, int lineno)
         fputs(line, stdout);
         columns -= len;
       } else {
-        unsigned spaces = vsplit1 - len + 1;
+        int spaces = vsplit1 - len + 1;
         fputs(line, stdout);
-        for (unsigned i = 0; i < spaces; i++)
+        for (int i = 0; i < spaces; i++)
           putchar(' ');
         columns -= vsplit1;
       }
       line += len;
       len = 0;
     } else {
-      for (unsigned i = 0; i < vsplit1; i++)
+      for (int i = 0; i < vsplit1; i++)
         putchar(line[i]);
       len -= vsplit1;
       line += vsplit1;
@@ -399,15 +399,15 @@ static void drawline(pwstate *pw, const char *line, int lineno)
   }
 
   if (vsplit2 > 0) {
-    unsigned width = vsplit2;
-    unsigned i = 0;
+    int width = vsplit2;
+    int i = 0;
 
     if (vsplit1) {
       hlchar(pw, '|');
       width--;
     }
     if (vs2pos < olen) {
-      unsigned nchar = min(olen - vs2pos, width);
+      int nchar = min(olen - vs2pos, width);
       const char *ptr = oline + vs2pos;
       for (; i < nchar; i++)
         putchar(*ptr++);
@@ -428,14 +428,14 @@ static void drawline(pwstate *pw, const char *line, int lineno)
     endmark = 1;
   }
 
-  if ((size_t) pw->hpos + 1 <= len) {
+  if (pw->hpos + 1 <= len) {
     if (pw->hpos || vsplit1 || vsplit2) {
       line += pw->hpos + 1;
       len -= pw->hpos + 1;
       hlchar(pw, '>');
       columns--;
     }
-    if (len < (size_t) columns) {
+    if (len < columns) {
       fputs(line, stdout);
       clreol(1);
     } else {
@@ -1192,7 +1192,7 @@ int main(int argc, char **argv)
           case 'h':
             if (cmdcount == UINT_MAX)
               cmdcount = 8;
-            if (pw.hpos >= cmdcount)
+            if (pw.hpos >= (int) cmdcount)
               pw.hpos -= cmdcount;
             else
               pw.hpos = 0;
@@ -1393,12 +1393,11 @@ int main(int argc, char **argv)
             break;
           case CR: case ctrl('c'):
             if (ch == CR) {
-              unsigned trig = (cmdcount == UINT_MAX || cmdcount == 0
-                               ? 0 : cmdcount - 1);
+              int trig = (cmdcount == UINT_MAX || cmdcount == 0
+                          ? 0 : cmdcount - 1);
               if (pw.cmdbuf[1]) {
-                unsigned *pnhist = (kbd_state == kbd_colon
-                                    ? &ncmdhist : &npathist);
-                unsigned nhist = *pnhist;
+                int *pnhist = (kbd_state == kbd_colon ? &ncmdhist : &npathist);
+                int nhist = *pnhist;
                 char ***hist = (kbd_state == kbd_colon ?
                                 &cmdhist : &pathist);