Changeset 3484 for libcaca/trunkTweet

Timestamp:

May 19, 2009, 10:42:40 PM (11 years ago)

Author:

Sam Hocevar

Message:

Fix a few DOS compilation warnings.

Location:

libcaca/trunk/caca

Files:

• dirty.c (modified) (2 diffs)
• figfont.c (modified) (2 diffs)

libcaca/trunk/caca/dirty.c

@@ -58 +58 @@
  *
  *  \param cv A libcaca canvas.
- *  \param index The requested rectangle index.
+ *  \param r The requested rectangle index.
  *  \param xmin A pointer to an integer where the leftmost edge of the
  *              dirty rectangle will be stored.
@@ -69 +69 @@
  *  \return 0 in case of success, -1 if an error occurred.
  */
-int caca_get_dirty_rectangle(caca_canvas_t *cv, int index,
+int caca_get_dirty_rectangle(caca_canvas_t *cv, int r,
                              int *xmin, int *ymin, int *xmax, int *ymax)
 {
-    if(index < 0 || index >= cv->ndirty)
+    if(r < 0 || r >= cv->ndirty)
     {
         seterrno(EINVAL);

libcaca/trunk/caca/figfont.c

@@ -391 +391 @@
         else
         {
+            unsigned int tmp;
+
             if(caca_file_gets(f, buf, 2048) == NULL)
                 break;
@@ -416 +418 @@
             }
 
-            if(buf[1] == 'x')
-                sscanf(buf, "%x", &ff->lookup[ff->glyphs * 2]);
-            else
-                sscanf(buf, "%u", &ff->lookup[ff->glyphs * 2]);
+            sscanf(buf, buf[1] == 'x' ? "%x" : "%u", &tmp);
+            ff->lookup[ff->glyphs * 2] = tmp;
         }