From: François Pinard <pinard@iro.umontreal.ca>
Date: Wed, 5 Mar 2008 20:25:16 +0000 (-0500)
Subject: Suppress a few warnings; other details
X-Git-Tag: v3.7-beta2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1125997dfda30d6f87d60f416b6b9915288ff90e;p=recode

Suppress a few warnings; other details
---

diff --git a/README b/README
index 46214c4..815aa6b 100644
--- a/README
+++ b/README
@@ -127,7 +127,7 @@ So this is in no way a candidate for a Recode 3.7 release.
 The test suite is worth more comments:
 
 + The suite is very partial, and may not be thought as a validation
-  suite.  Before it could be used to ascertain confidence, it would need,
+  suite.  Before it could be used to ascertain confidence, it would need
   much more tests than it has already.
 
 + Testing is notably more speedy than it used to be.  For example, the
diff --git a/src/ChangeLog b/src/ChangeLog
index 675186d..40cf1ca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,10 @@
 	various hasher functions according to the prototype in hash.h.
 	Reported by Bruno Haible.
 
+	* mergelex.py: Suppress yyunput.
+	* recodext.h (get_byte_helper): Declare also when !INLINE_HARDER.
+	Reported by Bruno Haible.
+
 2008-02-27  François Pinard  <pinard@iro.umontreal.ca>
 
 	* hash.c: Revert last change (2008-02-21).  The renaming of symbols
diff --git a/src/merged.c b/src/merged.c
index 8555757..3886ee3 100644
--- a/src/merged.c
+++ b/src/merged.c
@@ -912,8 +912,6 @@ extern int librecode_yywrap (void );
 #endif
 #endif
 
-    static void yyunput (int c,char *buf_ptr  );
-    
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
@@ -2379,43 +2377,6 @@ static int yy_get_next_buffer (void)
 	return yy_is_jam ? 0 : yy_current_state;
 }
 
-    static void yyunput (int c, register char * yy_bp )
-{
-	register char *yy_cp;
-    
-    yy_cp = (yy_c_buf_p);
-
-	/* undo effects of setting up librecode_yytext */
-	*yy_cp = (yy_hold_char);
-
-	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
-		{ /* need to shift things up to make room */
-		/* +2 for EOB chars. */
-		register int number_to_move = (yy_n_chars) + 2;
-		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
-					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
-		register char *source =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
-
-		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			*--dest = *--source;
-
-		yy_cp += (int) (dest - source);
-		yy_bp += (int) (dest - source);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
-
-		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
-			YY_FATAL_ERROR( "flex scanner push-back overflow" );
-		}
-
-	*--yy_cp = (char) c;
-
-	(yytext_ptr) = yy_bp;
-	(yy_hold_char) = *yy_cp;
-	(yy_c_buf_p) = yy_cp;
-}
-
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
     static int yyinput (void)
diff --git a/src/mergelex.py b/src/mergelex.py
index b35ef95..b272579 100644
--- a/src/mergelex.py
+++ b/src/mergelex.py
@@ -29,6 +29,7 @@ section0 = [
 # Flex and C declarations.
 section1 = '''\
 
+%option nounput
 %option noyywrap
 %{
 #include "common.h"
diff --git a/src/recode.1 b/src/recode.1
index bbcebbf..d4bb15a 100644
--- a/src/recode.1
+++ b/src/recode.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
-.TH RECODE "1" "February 2008" "recode 3.7-beta1" "User Commands"
+.TH RECODE "1" "March 2008" "recode 3.7-beta1" "User Commands"
 .SH NAME
 recode \- converts files between character sets
 .SH SYNOPSIS
diff --git a/src/recodext.h b/src/recodext.h
index e24afc6..1a0a776 100644
--- a/src/recodext.h
+++ b/src/recodext.h
@@ -671,7 +671,7 @@ const char *ucs2_to_rfc1345 PARAMS ((recode_ucs2));
 
 /* task.c.  */
 
-#if USE_HELPERS
+#if USE_HELPERS || !INLINE_HARDER
 int get_byte_helper PARAMS ((RECODE_SUBTASK));
 #endif
 void put_byte_helper PARAMS ((int, RECODE_SUBTASK));