Commit: 2b7377d3dfecb79882b3d67ea4d50aaf897a557a - mingw-catgets (git)

POSIX.1 National Language Support API for MinGW

Commit MetaInfo

• Revisión: 2b7377d3dfecb79882b3d67ea4d50aaf897a557a (tree)
• Tiempo: 2007-11-10 23:34:45
• Autor: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Relocate misplaced declaration statements to precede assignments or function calls, within their containing scopes.

Cambiar Resumen

• modified: ChangeLog
• modified: catopen.c
• modified: mcsource.c

Diferencia incremental

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
[phone]  Charles Wilson  <[e-mail]>
+
+	Relocate misplaced declaration statements to precede assignments or
+	function calls, within their containing scopes.
+
+	* catopen.c (mc_open): Relocate `retval' declaration, at top level.
+	(mc_nlspath_open): Relocate `break_code' declaration within enclosing
+	`if' block.
+
+	* mcsource.c (mc_source): Declare `len' before `dfprintf', within
+	enclosing `if' block.
+
 2007-08-17  Keith Marshall  <[e-mail]>
 
 	Avoid a potential segmentation fault.

--- a/catopen.c
+++ b/catopen.c
@@ -9,7 +9,7 @@
  * POSIX compatible national language message catalogues in MinGW.
  *
  * Written by Keith Marshall  <[e-mail]>
- * Last modification: 08-Aug-2007
+ * Last modification: 22-Sept-2007
  *
  *
  * This is free software.  It is provided AS IS, in the hope that it may
@@ -330,8 +330,8 @@ int mc_nlspath_open( __const char *msgcat, unsigned flags )
 		 ||  ((nls_locale = mc_nl_cat_locale_getenv( flags )) != NULL)
 		 ||  ((nls_locale = setlocale( LC_MESSAGES, NULL )) != NULL)    )
 		 {
-		   subst = nls_locale;
 		   wchar_t *break_code = L"_.@";
+		   subst = nls_locale;
 
 		   if( chk == L'L' )
 		   {
@@ -401,6 +401,7 @@ void *mc_open( struct mc_tab *cdt, va_list argv )
    */
   char *catname = va_arg( argv, char * );
   unsigned tab_increment, flags = va_arg( argv, unsigned );
+  int retval = 0;
 
   /* First, check the `catopen' flags, to determine how many new descriptor
    * table slots to create, if we need to expand the table.
@@ -410,7 +411,6 @@ void *mc_open( struct mc_tab *cdt, va_list argv )
 
   /* Find the first free slot, if any, in the descriptor table.
    */
-  int retval = 0;
   while( (retval < cdt->curr_size) && (cdt->tab[ retval ].fd >= 0) )
     ++retval;
 
@@ -496,4 +496,4 @@ nl_catd catopen( __const char *name, int flags )
   return (nl_catd)_mctab_( mc_open, name, flags );
 }
 
-/* $RCSfile$Revision: 1.3 $: end of file */
+/* $RCSfile$Revision: 1.4 $: end of file */

--- a/mcsource.c
+++ b/mcsource.c
@@ -9,7 +9,7 @@
  * used internally by `gencat', to compile message dictionaries.
  *
  * Written by Keith Marshall  <[e-mail]>
- * Last modification: 21-May-2007
+ * Last modification: 22-Sept-2007
  *
  *
  * This is free software.  It is provided AS IS, in the hope that it may
@@ -915,12 +915,14 @@ struct msgdict *mc_source( const char *input )
 	       */
 	      if( last_char == L'\r' )
 	      {
+		size_t len;
+
 		/* The previous character was a deferred carriage return,
 		 * but it was *not* the lead byte in a CRLF line terminator,
 		 * so we need to emit it into the message definition.
 		 */
 		dfprintf(( stderr, "\n%s:%u:", input, linenum ));
-		size_t len = mc_add_escape( iconv_map, messages + msgloc, L'\r' );
+		len = mc_add_escape( iconv_map, messages + msgloc, L'\r' );
 		if( len > (size_t)(0) )
 		{
 		  headroom -= len;
@@ -1263,4 +1265,4 @@ struct msgdict *mc_source( const char *input )
   return head;
 }
 
-/* $RCSfile$Revision: 1.10 $: end of file */
+/* $RCSfile$Revision: 1.11 $: end of file */