[Midnightbsd-cvs] src [9408] trunk/gnu/usr.bin/grep: chnage int vars to size_t ssize_t or ptrdiff_t.

[laffer1 at midnightbsd.org]

Revision: 9408
          http://svnweb.midnightbsd.org/src/?rev=9408
Author:   laffer1
Date:     2017-03-04 16:40:08 -0500 (Sat, 04 Mar 2017)
Log Message:
-----------
chnage int vars to size_t ssize_t or ptrdiff_t.

Modified Paths:
--------------
    trunk/gnu/usr.bin/grep/dfa.c
    trunk/gnu/usr.bin/grep/grep.c
    trunk/gnu/usr.bin/grep/search.c

Modified: trunk/gnu/usr.bin/grep/dfa.c
===================================================================
--- trunk/gnu/usr.bin/grep/dfa.c	2017-03-04 21:39:21 UTC (rev 9407)
+++ trunk/gnu/usr.bin/grep/dfa.c	2017-03-04 21:40:08 UTC (rev 9408)
@@ -334,9 +334,10 @@
 #ifdef MBS_SUPPORT
 /* These variables are used only if (MB_CUR_MAX > 1).  */
 static mbstate_t mbs;		/* Mbstate for mbrlen().  */
-static int cur_mb_len;		/* Byte length of the current scanning
-				   multibyte character.  */
-static int cur_mb_index;        /* Byte index of the current scanning multibyte
+static ssize_t cur_mb_len;	/* Byte length of the current scanning
+				   multibyte character.  Must also handle
+				   negative result from mbrlen().  */
+static ssize_t cur_mb_index;	/* Byte index of the current scanning multibyte
                                    character.
 
 				   singlebyte character : cur_mb_index = 0
@@ -369,7 +370,7 @@
 /* This function update cur_mb_len, and cur_mb_index.
    p points current lexptr, len is the remaining buffer length.  */
 static void
-update_mb_len_index (unsigned char const *p, int len)
+update_mb_len_index (unsigned char const *p, size_t len)
 {
   /* If last character is a part of a multibyte character,
      we update cur_mb_index.  */
@@ -2463,7 +2464,7 @@
   int match;		/* Flag which represent that matching succeed.  */
   int match_len;	/* Length of the character (or collating element)
 			   with which this operator match.  */
-  int op_len;		/* Length of the operator.  */
+  size_t op_len;	/* Length of the operator.  */
   char buffer[128];
   wchar_t wcbuf[6];
 

Modified: trunk/gnu/usr.bin/grep/grep.c
===================================================================
--- trunk/gnu/usr.bin/grep/grep.c	2017-03-04 21:39:21 UTC (rev 9407)
+++ trunk/gnu/usr.bin/grep/grep.c	2017-03-04 21:40:08 UTC (rev 9408)
@@ -1346,9 +1346,9 @@
 main (int argc, char **argv)
 {
   char *keys;
-  size_t keycc, oldcc, keyalloc;
+  size_t cc, keycc, oldcc, keyalloc;
   int with_filenames;
-  int opt, cc, status;
+  int opt, status;
   int default_context;
   FILE *fp;
   extern char *optarg;

Modified: trunk/gnu/usr.bin/grep/search.c
===================================================================
--- trunk/gnu/usr.bin/grep/search.c	2017-03-04 21:39:21 UTC (rev 9407)
+++ trunk/gnu/usr.bin/grep/search.c	2017-03-04 21:40:08 UTC (rev 9408)
@@ -112,7 +112,7 @@
 kwsinit (void)
 {
   static char trans[NCHAR];
-  int i;
+  size_t i;
 
   if (match_icase)
     for (i = 0; i < NCHAR; ++i)
@@ -326,7 +326,8 @@
 {
   register char const *buflim, *beg, *end;
   char eol = eolbyte;
-  int backref, start, len;
+  int backref;
+  ptrdiff_t start, len;
   struct kwsmatch kwsm;
   size_t i, ret_val;
   static int use_dfa;