Enlightenment CVS committal
Author : dj2
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/emblem
Modified Files:
Emblem.h emblem_ui.c main.c
Log Message:
- Include Ecore_File.h to remove warning
- use __UNUSED__ instead of the other way to shut up warnings
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/Emblem.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Emblem.h 14 May 2005 10:33:47 -0000 1.2
+++ Emblem.h 16 May 2005 03:07:52 -0000 1.3
@@ -8,12 +8,20 @@
#include <Ecore.h>
#include <Ecore_Evas.h>
#include <Ecore_Job.h>
+#include <Ecore_File.h>
#include <Evas.h>
#include <Edje.h>
#include <Esmart/Esmart_Container.h>
#include "config.h"
+#undef __UNUSED__
+#if HAVE___ATTRIBUTE__
+#define __UNUSED__ __attribute__((unused))
+#else
+#define __UNUSED__
+#endif
+
typedef struct Emblem Emblem;
struct Emblem
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/emblem_ui.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- emblem_ui.c 14 May 2005 10:33:47 -0000 1.10
+++ emblem_ui.c 16 May 2005 03:07:53 -0000 1.11
@@ -290,7 +290,7 @@
}
static int
-emblem_ui_e_bg_get(void *data, int type, void *ev)
+emblem_ui_e_bg_get(void *data, int type __UNUSED__, void *ev)
{
Emblem *em;
E_Response_Background_Get *e;
@@ -298,13 +298,11 @@
e = ev;
em = data;
emblem_current_bg_set(em, e->file);
-
return 1;
- type = 0;
}
static int
-emblem_ui_e_bg_dirs_list(void *data, int type, void *ev)
+emblem_ui_e_bg_dirs_list(void *data, int type __UNUSED__, void *ev)
{
Emblem *em;
E_Response_Background_Dirs_List *e;
@@ -317,25 +315,21 @@
emblem_ui_init_dir(em, e->dirs[i]);
return 1;
- type = 0;
}
static void
-emblem_current_sel_cb(void *data, Evas *evas, Evas_Object *obj, void *ev)
+emblem_current_sel_cb(void *data __UNUSED__, Evas *evas __UNUSED__,
+ Evas_Object *obj, void *ev __UNUSED__)
{
char *name;
-
name = evas_object_data_get(obj, "file");
e_background_set(name);
-
return;
- evas = NULL;
- data = NULL;
- ev = NULL;
}
static void
-emblem_menu_sel_cb(void *data, Evas *evas, Evas_Object *obj, void *ev)
+emblem_menu_sel_cb(void *data __UNUSED__, Evas *evas __UNUSED__,
+ Evas_Object *obj, void *ev __UNUSED__)
{
Emblem *em;
char *name;
@@ -343,75 +337,47 @@
em = data;
name = evas_object_data_get(obj, "file");
emblem_current_bg_set(em, name);
-
return;
- evas = NULL;
- data = NULL;
- ev = NULL;
}
static void
-emblem_left_scroll_down_cb(void *data, Evas_Object *obj,
- const char *emission, const char *src)
+emblem_left_scroll_down_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
+ const char *emission __UNUSED__, const char *src __UNUSED__)
{
Emblem *em;
-
em = data;
esmart_container_scroll_start(em->gui.menu, -2);
-
return;
- data = NULL;
- obj = NULL;
- emission = NULL;
- src = NULL;
}
static void
-emblem_right_scroll_down_cb(void *data, Evas_Object *obj,
- const char *emission, const char *src)
+emblem_right_scroll_down_cb(void *data __UNUSED__, Evas_Object *obj
__UNUSED__,
+ const char *emission __UNUSED__, const char *src __UNUSED__)
{
Emblem *em;
-
em = data;
esmart_container_scroll_start(em->gui.menu, 2);
-
return;
- data = NULL;
- obj = NULL;
- emission = NULL;
- src = NULL;
}
static void
-emblem_left_scroll_up_cb(void *data, Evas_Object *obj,
- const char *emission, const char *src)
+emblem_left_scroll_up_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
+ const char *emission __UNUSED__, const char *src __UNUSED__)
{
Emblem *em;
-
em = data;
esmart_container_scroll_stop(em->gui.menu);
-
return;
- data = NULL;
- obj = NULL;
- emission = NULL;
- src = NULL;
}
static void
-emblem_right_scroll_up_cb(void *data, Evas_Object *obj,
- const char *emission, const char *src)
+emblem_right_scroll_up_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
+ const char *emission __UNUSED__, const char *src __UNUSED__)
{
Emblem *em;
-
em = data;
esmart_container_scroll_stop(em->gui.menu);
-
return;
- data = NULL;
- obj = NULL;
- emission = NULL;
- src = NULL;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- main.c 16 May 2005 00:45:47 -0000 1.3
+++ main.c 16 May 2005 03:07:53 -0000 1.4
@@ -3,14 +3,10 @@
static void usage(void);
static int
-exit_cb(void *data, int type, void *ev)
+exit_cb(void *data __UNUSED__, int type __UNUSED__, void *ev __UNUSED__)
{
ecore_main_loop_quit();
-
return 0;
- data = NULL;
- type = 0;
- ev = NULL;
}
int
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
