diff src/regex.c @ 274:ca9a9ec9c1c1 r21-0b35

Import from CVS: tag r21-0b35
author cvs
date Mon, 13 Aug 2007 10:29:42 +0200
parents c5d627a313b1
children c42ec1d1cded
line wrap: on
line diff
--- a/src/regex.c	Mon Aug 13 10:28:54 2007 +0200
+++ b/src/regex.c	Mon Aug 13 10:29:42 2007 +0200
@@ -701,7 +701,7 @@
   /* Loop over pattern commands.  */
   while (p < pend)
     {
-      printf ("%d:\t", p - start);
+      printf ("%ld:\t", (long)(p - start));
 
       switch ((re_opcode_t) *p++)
 	{
@@ -800,14 +800,14 @@
 		if (first < 0x100)
 		  putchar (first);
 		else
-		  printf ("(0x%x)", first);
+		  printf ("(0x%lx)", (long)first);
 		if (first != last)
 		  {
 		    putchar ('-');
 		    if (last < 0x100)
 		      putchar (last);
 		    else
-		      printf ("(0x%x)", last);
+		      printf ("(0x%lx)", (long)last);
 		  }
 	      }
 	    putchar (']');
@@ -826,17 +826,17 @@
 
 	case on_failure_jump:
           extract_number_and_incr (&mcnt, &p);
-  	  printf ("/on_failure_jump to %d", p + mcnt - start);
+  	  printf ("/on_failure_jump to %ld", (long)(p + mcnt - start));
           break;
 
 	case on_failure_keep_string_jump:
           extract_number_and_incr (&mcnt, &p);
-  	  printf ("/on_failure_keep_string_jump to %d", p + mcnt - start);
+  	  printf ("/on_failure_keep_string_jump to %ld", (long)(p + mcnt - start));
           break;
 
 	case dummy_failure_jump:
           extract_number_and_incr (&mcnt, &p);
-  	  printf ("/dummy_failure_jump to %d", p + mcnt - start);
+  	  printf ("/dummy_failure_jump to %ld", (long)(p + mcnt - start));
           break;
 
 	case push_dummy_failure:
@@ -845,40 +845,40 @@
 
         case maybe_pop_jump:
           extract_number_and_incr (&mcnt, &p);
-  	  printf ("/maybe_pop_jump to %d", p + mcnt - start);
+  	  printf ("/maybe_pop_jump to %ld", (long)(p + mcnt - start));
 	  break;
 
         case pop_failure_jump:
 	  extract_number_and_incr (&mcnt, &p);
-  	  printf ("/pop_failure_jump to %d", p + mcnt - start);
+  	  printf ("/pop_failure_jump to %ld", (long)(p + mcnt - start));
 	  break;
 
         case jump_past_alt:
 	  extract_number_and_incr (&mcnt, &p);
-  	  printf ("/jump_past_alt to %d", p + mcnt - start);
+  	  printf ("/jump_past_alt to %ld", (long)(p + mcnt - start));
 	  break;
 
         case jump:
 	  extract_number_and_incr (&mcnt, &p);
-  	  printf ("/jump to %d", p + mcnt - start);
+  	  printf ("/jump to %ld", (long)(p + mcnt - start));
 	  break;
 
         case succeed_n:
           extract_number_and_incr (&mcnt, &p);
           extract_number_and_incr (&mcnt2, &p);
-	  printf ("/succeed_n to %d, %d times", p + mcnt - start, mcnt2);
+	  printf ("/succeed_n to %ld, %d times", (long)(p + mcnt - start), mcnt2);
           break;
 
         case jump_n:
           extract_number_and_incr (&mcnt, &p);
           extract_number_and_incr (&mcnt2, &p);
-	  printf ("/jump_n to %d, %d times", p + mcnt - start, mcnt2);
+	  printf ("/jump_n to %ld, %d times", (long)(p + mcnt - start), mcnt2);
           break;
 
         case set_number_at:
           extract_number_and_incr (&mcnt, &p);
           extract_number_and_incr (&mcnt2, &p);
-	  printf ("/set_number_at location %d to %d", p + mcnt - start, mcnt2);
+	  printf ("/set_number_at location %ld to %d", (long)(p + mcnt - start), mcnt2);
           break;
 
         case wordbound:
@@ -961,7 +961,7 @@
       putchar ('\n');
     }
 
-  printf ("%d:\tend of pattern.\n", p - start);
+  printf ("%ld:\tend of pattern.\n", (long)(p - start));
 }