[Gnash-commit] gnash ChangeLog cygnal/crc.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/03/05 17:00:37

Modified files:
        .              : ChangeLog 
        cygnal         : crc.cpp 

Log message:
        update cygnal's crc to build after changes in RcInitFile interface.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5810&r2=1.5811
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/crc.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5810
retrieving revision 1.5811
diff -u -b -r1.5810 -r1.5811
--- ChangeLog   5 Mar 2008 11:54:32 -0000       1.5810
+++ ChangeLog   5 Mar 2008 17:00:36 -0000       1.5811
@@ -1,3 +1,8 @@
+2008-03-04 Sandro Santilli <address@hidden>
+
+       * cygnal/crc.cpp: update to build after changes in RcInitFile
+         interface.
+
 2008-03-04 Benjamin Wolsey <address@hidden>
 
        * libbase/log.{h,cpp}: add templates to convert from vsnprintf format

Index: cygnal/crc.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/crc.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- cygnal/crc.cpp      19 Feb 2008 19:20:48 -0000      1.4
+++ cygnal/crc.cpp      5 Mar 2008 17:00:37 -0000       1.5
@@ -170,16 +170,16 @@
             }
 
             bool test;
-            extractSetting(&test, "actionDump", variable, value);
-            extractSetting(&test, "parserDump", variable, value);
+            uint32_t num;
+
+            if ( extractSetting(test, "actionDump", variable, value) )
             useParserDump(test);
+            else if ( extractSetting(test, "parserDump", variable, value) )
             useActionDump(test);
-
-            uint32_t num;
-            extractNumber(&num, "verbosity", variable, value);
+            else if ( extractNumber(num, "verbosity", variable, value) )
             verbosityLevel(num);
+            else extractNumber((uint32_t&)_port_offset, "portOffset", 
variable, value);
             
-            extractNumber((uint32_t *)&_port_offset, "portOffset", variable, 
value);
         } while (!in.eof());
 
     } else {