Enlightenment CVS committal

Author  : sebastid
Project : e17
Module  : libs/imlib2

Dir     : e17/libs/imlib2/src/bin


Modified Files:
        imlib2_bumpmap.c imlib2_show.c 


Log Message:
Remove unused variables.
Remove signedness warning.
Print pointers with %p

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/bin/imlib2_bumpmap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- imlib2_bumpmap.c    29 Jan 2005 20:57:54 -0000      1.2
+++ imlib2_bumpmap.c    20 Sep 2005 17:28:23 -0000      1.3
@@ -31,7 +31,7 @@
 int
 main(int argc, char **argv)
 {
-   int                 i, j, w, h, x, y;
+   int                 w, h, x, y;
    Imlib_Image         im = NULL, im_bg = NULL;
    XEvent              ev;
    const char         *display_name = getenv("DISPLAY");
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/bin/imlib2_show.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- imlib2_show.c       29 Jan 2005 20:57:54 -0000      1.2
+++ imlib2_show.c       20 Sep 2005 17:28:23 -0000      1.3
@@ -54,7 +54,7 @@
 int
 main(int argc, char **argv)
 {
-   int                 i, j;
+   int                 i;
    Imlib_Image        *im = NULL;
    int                 sec1, usec1, sec2, usec2;
    int                 pixels = 0;
@@ -322,9 +322,10 @@
         if (scale)
           {
              Window              d;
+             unsigned int        ud;
              int                 dd;
 
-             XGetGeometry(disp, win, &d, &dd, &dd, &dd, &dd, &dd, &dd);
+             XGetGeometry(disp, win, &d, &dd, &dd, &ud, &ud, &ud, &ud);
           }
         XSync(disp, False);
      }
@@ -816,7 +817,7 @@
              printf("Font Cache test start\n");
 
              f = imlib_load_font("notepad/10");
-             printf("imlib_load_font: f=%x, next=%8x, type=%d, ref=%d, '%s'\n",
+             printf("imlib_load_font: f=%p, next=%p, type=%d, ref=%d, '%s'\n",
                     f, f->next, f->type, f->ref, f->name);
              imlib_context_set_font((Imlib_Font) f);
              printf
@@ -825,12 +826,12 @@
                   imlib_get_maximum_font_ascent(),
                   imlib_get_maximum_font_descent());
              imlib_free_font();
-             printf("imlib_free_font: f=%x, next=%8x, type=%d, ref=%d, '%s'\n",
+             printf("imlib_free_font: f=%p, next=%p, type=%d, ref=%d, '%s'\n",
                     f, f->next, f->type, f->ref, f->name);
              printf("\n");
 
              f = imlib_load_font("-*-fixed-*--14-*");
-             printf("imlib_load_font: f=%x, next=%8x, type=%d, ref=%d, '%s'\n",
+             printf("imlib_load_font: f=%p, next=%p, type=%d, ref=%d, '%s'\n",
                     f, f->next, f->type, f->ref, f->name);
              imlib_context_set_font((Imlib_Font) f);
              printf
@@ -839,61 +840,61 @@
                   imlib_get_maximum_font_ascent(),
                   imlib_get_maximum_font_descent());
              imlib_free_font();
-             printf("imlib_free_font: f=%x, next=%8x, type=%d, ref=%d, '%s'\n",
+             printf("imlib_free_font: f=%p, next=%p, type=%d, ref=%d, '%s'\n",
                     f, f->next, f->type, f->ref, f->name);
              printf("\n");
 
              f1 = imlib_load_font("notepad/10");
-             printf("imlib_load_font: f=%x, next=%8x, type=%d, ref=%d, '%s'\n",
+             printf("imlib_load_font: f=%p, next=%p, type=%d, ref=%d, '%s'\n",
                     f1, f1->next, f1->type, f1->ref, f1->name);
              f2 = imlib_load_font("-*-fixed-*--14-*");
-             printf("imlib_load_font: f=%x, next=%8x, type=%d, ref=%d, '%s'\n",
+             printf("imlib_load_font: f=%p, next=%p, type=%d, ref=%d, '%s'\n",
                     f2, f2->next, f2->type, f2->ref, f2->name);
              f3 = imlib_load_font("notepad/10,-*-fixed-*--14-*");
-             printf("imlib_load_font: f=%x, next=%8x, type=%d, ref=%d, '%s'\n",
+             printf("imlib_load_font: f=%p, next=%p, type=%d, ref=%d, '%s'\n",
                     f3, f3->next, f3->type, f3->ref, f3->name);
              f = f3->ttf;
-             printf("         f->ttf: f=%x, next=%8x, type=%d, ref=%d, '%s'\n",
+             printf("         f->ttf: f=%p, next=%p, type=%d, ref=%d, '%s'\n",
                     f, f->next, f->type, f->ref, f->name);
              f4 = imlib_load_font("notepad/10,-*-fixed-*--14-*");
-             printf("imlib_load_font: f=%x, next=%8x, type=%d, ref=%d, '%s'\n",
+             printf("imlib_load_font: f=%p, next=%p, type=%d, ref=%d, '%s'\n",
                     f4, f4->next, f4->type, f4->ref, f4->name);
              f = f4->ttf;
-             printf("         f->ttf: f=%x, next=%8x, type=%d, ref=%d, '%s'\n",
+             printf("         f->ttf: f=%p, next=%p, type=%d, ref=%d, '%s'\n",
                     f, f->next, f->type, f->ref, f->name);
              printf("\n");
 
              imlib_context_set_font((Imlib_Font) f4);
              imlib_free_font();
-             printf("imlib_free_font: f=%x, next=%8x, type=%d, ref=%d, '%s'\n",
+             printf("imlib_free_font: f=%p, next=%p, type=%d, ref=%d, '%s'\n",
                     f4, f4->next, f4->type, f4->ref, f4->name);
              f = f4->ttf;
-             printf("         f->ttf: f=%x, next=%8x, type=%d, ref=%d, '%s'\n",
+             printf("         f->ttf: f=%p, next=%p, type=%d, ref=%d, '%s'\n",
                     f, f->next, f->type, f->ref, f->name);
              imlib_context_set_font((Imlib_Font) f1);
              imlib_free_font();
-             printf("imlib_free_font: f=%x, next=%8x, type=%d, ref=%d, '%s'\n",
+             printf("imlib_free_font: f=%p, next=%p, type=%d, ref=%d, '%s'\n",
                     f1, f1->next, f1->type, f1->ref, f1->name);
              imlib_context_set_font((Imlib_Font) f2);
              imlib_free_font();
-             printf("imlib_free_font: f=%x, next=%8x, type=%d, ref=%d, '%s'\n",
+             printf("imlib_free_font: f=%p, next=%p, type=%d, ref=%d, '%s'\n",
                     f2, f2->next, f2->type, f2->ref, f2->name);
              imlib_context_set_font((Imlib_Font) f3);
              imlib_free_font();
-             printf("imlib_free_font: f=%x, next=%8x, type=%d, ref=%d, '%s'\n",
+             printf("imlib_free_font: f=%p, next=%p, type=%d, ref=%d, '%s'\n",
                     f3, f3->next, f3->type, f3->ref, f3->name);
              f = f3->ttf;
-             printf("         f->ttf: f=%x, next=%8x, type=%d, ref=%d, '%s'\n",
+             printf("         f->ttf: f=%p, next=%p, type=%d, ref=%d, '%s'\n",
                     f, f->next, f->type, f->ref, f->name);
              printf("\n");
              imlib_flush_font_cache();
              printf("imlib_flush_font_cache: \n");
              printf("\n");
              f1 = imlib_load_font("notepad/10,-*-fixed-*--14-*");
-             printf("imlib_load_font: f=%x, next=%8x, type=%d, ref=%d, '%s'\n",
+             printf("imlib_load_font: f=%p, next=%p, type=%d, ref=%d, '%s'\n",
                     f1, f1->next, f1->type, f1->ref, f1->name);
              f = f1->ttf;
-             printf("         f->ttf: f=%x, next=%8x, type=%d, ref=%d, '%s'\n",
+             printf("         f->ttf: f=%p, next=%p, type=%d, ref=%d, '%s'\n",
                     f, f->next, f->type, f->ref, f->name);
              imlib_context_set_font((Imlib_Font) f1);
              printf
@@ -1006,7 +1007,6 @@
                }
              else if (rotate)
                {
-                  Imlib_Image         rotim;
                   double              s, c;
                   int                 x1, y1, x2, y2, w, h;
 




-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to