[Tux4kids-commits] r892 - in tuxmath/trunk: doc src

[tholy-guest at alioth.debian.org]

Author: tholy-guest
Date: 2009-02-17 11:58:31 +0000 (Tue, 17 Feb 2009)
New Revision: 892

Modified:
   tuxmath/trunk/doc/changelog
   tuxmath/trunk/src/CMakeLists.txt
   tuxmath/trunk/src/fileops.c
   tuxmath/trunk/src/mathcards.c
   tuxmath/trunk/src/multiplayer.c
Log:
Fix convert_utf filename in CMake build. Eliminate the last few
warnings (David got almost all of them), so now tuxmath builds without
any compiler warnings.


Modified: tuxmath/trunk/doc/changelog
===================================================================
--- tuxmath/trunk/doc/changelog	2009-02-16 22:43:56 UTC (rev 891)
+++ tuxmath/trunk/doc/changelog	2009-02-17 11:58:31 UTC (rev 892)
@@ -1,3 +1,10 @@
+2009.Feb.17 (svn.debian.org/tux4kids - revision 892)
+        Fix convert_utf filename in CMake build. Eliminate the last few
+	warnings (David got almost all of them), so now tuxmath builds
+	without any compiler warnings.
+
+	Tim Holy <holy at wustl.edu>
+
 2009.Feb.15 (svn.debian.org/tux4kids - revision 889)
         build - moved linebreak-related code back to /linebreak, adjusted 
         autotools files. The code in /linebreak is now built as a static 

Modified: tuxmath/trunk/src/CMakeLists.txt
===================================================================
--- tuxmath/trunk/src/CMakeLists.txt	2009-02-16 22:43:56 UTC (rev 891)
+++ tuxmath/trunk/src/CMakeLists.txt	2009-02-17 11:58:31 UTC (rev 892)
@@ -18,7 +18,7 @@
 # tuxmath
 set(SOURCES_TUXMATH
   audio.c
-  ConvertUTF.c
+  convert_utf.c
   credits.c
   factoroids.c
   fileops.c

Modified: tuxmath/trunk/src/fileops.c
===================================================================
--- tuxmath/trunk/src/fileops.c	2009-02-16 22:43:56 UTC (rev 891)
+++ tuxmath/trunk/src/fileops.c	2009-02-17 11:58:31 UTC (rev 892)
@@ -1732,7 +1732,7 @@
   for (i = 0; i < NOPTS; ++i) //for each option
   {
     if (verbose && vcomments[i]) //comment goes before
-      fprintf(fp, vcomments[i]);
+      fprintf(fp, "%s", vcomments[i]);
     fprintf(fp, "%s = %d\n", MC_OPTION_TEXT[i], MC_GetOpt(i) );
   }
   

Modified: tuxmath/trunk/src/mathcards.c
===================================================================
--- tuxmath/trunk/src/mathcards.c	2009-02-16 22:43:56 UTC (rev 891)
+++ tuxmath/trunk/src/mathcards.c	2009-02-17 11:58:31 UTC (rev 892)
@@ -860,7 +860,7 @@
   for (i = 0; i < NOPTS; ++i)
     {
     if (verbose && vcomments[i] != NULL)
-      fprintf(fp, vcomments[i]);
+      fprintf(fp, "%s", vcomments[i]);
     fprintf(fp, "%s = %d\n", MC_OPTION_TEXT[i], math_opts->iopts[i]);
     }
   mcdprintf("\nLeaving MC_PrintMathOptions()\n");
@@ -2433,7 +2433,7 @@
     sscanf(beg, "%s", nans);
     *beg = 0; //sequester the first half of the string
     snprintf(card->formula_string, max_formula_size, "%s?%s", nformula, end);
-    snprintf(card->answer_string, max_answer_size, nans);
+    snprintf(card->answer_string, max_answer_size, "%s", nans);
     card->answer = atoi(card->answer_string);
   }
 }

Modified: tuxmath/trunk/src/multiplayer.c
===================================================================
--- tuxmath/trunk/src/multiplayer.c	2009-02-16 22:43:56 UTC (rev 891)
+++ tuxmath/trunk/src/multiplayer.c	2009-02-17 11:58:31 UTC (rev 892)
@@ -172,7 +172,7 @@
 
   const char* winnername = (winners[0] == -1 ? "Nobody" : pnames[winners[0]] );
   
-  tmdprintf(pnames[winners[0]] );
+  tmdprintf("%s", pnames[winners[0]] );
   tmdprintf("%d\n", snprintf(text, HIGH_SCORE_NAME_LENGTH + strlen(" wins!"),
                     "%s wins!", winnername) );
   tmdprintf("Win text: %s\n", text);