summaryrefslogtreecommitdiff
path: root/legacy/eeze/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2010-05-14 05:21:52 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2010-05-14 05:21:52 +0000
commit90b028d63c2359cfb20b671fc692a66af1ca2f12 (patch)
tree1697f6562387bdcc8af27e64eea153f5a280f1c6 /legacy/eeze/src
parent308c35adac1a939cf054a1e9c463814d204bd2b8 (diff)
move/rename all files/functions/variables to eeze_udev for proper namespacing
SVN revision: 48845
Diffstat (limited to 'legacy/eeze/src')
-rw-r--r--legacy/eeze/src/bin/Makefile.am10
-rw-r--r--legacy/eeze/src/bin/eeze_udev_test.c42
-rw-r--r--legacy/eeze/src/lib/udev/Eeze_Udev.h (renamed from legacy/eeze/src/lib/udev/E_Udev.h)34
-rw-r--r--legacy/eeze/src/lib/udev/Makefile.am22
-rw-r--r--legacy/eeze/src/lib/udev/eeze_udev.c (renamed from legacy/eeze/src/lib/udev/e_udev.c)26
-rw-r--r--legacy/eeze/src/lib/udev/eeze_udev_main.c (renamed from legacy/eeze/src/lib/udev/e_udev_main.c)12
-rw-r--r--legacy/eeze/src/lib/udev/eeze_udev_private.h (renamed from legacy/eeze/src/lib/udev/e_udev_private.h)4
-rw-r--r--legacy/eeze/src/lib/udev/eeze_udev_watch.c (renamed from legacy/eeze/src/lib/udev/e_udev_watch.c)8
8 files changed, 79 insertions, 79 deletions
diff --git a/legacy/eeze/src/bin/Makefile.am b/legacy/eeze/src/bin/Makefile.am
index b328ad00b1..cba60d5c06 100644
--- a/legacy/eeze/src/bin/Makefile.am
+++ b/legacy/eeze/src/bin/Makefile.am
@@ -7,15 +7,15 @@ EEZE_CPPFLAGS = \
7LIBS = \ 7LIBS = \
8@ECORE_LIBS@ 8@ECORE_LIBS@
9 9
10if BUILD_EUDEV 10if BUILD_EEZE_UDEV
11EUDEV_PROG = eeze_udev_test 11EEZE_UDEV_PROG = eeze_udev_test
12endif 12endif
13 13
14bin_PROGRAMS = \ 14bin_PROGRAMS = \
15$(EUDEV_PROG) 15$(EEZE_UDEV_PROG)
16 16
17if BUILD_EUDEV 17if BUILD_EEZE_UDEV
18eeze_udev_test_SOURCES = eeze_udev_test.c 18eeze_udev_test_SOURCES = eeze_udev_test.c
19eeze_udev_test_CPPFLAGS = $(EEZE_CPPFLAGS) 19eeze_udev_test_CPPFLAGS = $(EEZE_CPPFLAGS)
20eeze_udev_test_LDADD = $(top_builddir)/src/lib/udev/libeudev.la 20eeze_udev_test_LDADD = $(top_builddir)/src/lib/udev/libeeze_udev.la
21endif 21endif
diff --git a/legacy/eeze/src/bin/eeze_udev_test.c b/legacy/eeze/src/bin/eeze_udev_test.c
index 4a3cc6da6e..e6e91022bf 100644
--- a/legacy/eeze/src/bin/eeze_udev_test.c
+++ b/legacy/eeze/src/bin/eeze_udev_test.c
@@ -1,4 +1,4 @@
1#include <E_Udev.h> 1#include <Eeze_Udev.h>
2#include <Ecore.h> 2#include <Ecore.h>
3#include <stdio.h> 3#include <stdio.h>
4 4
@@ -28,7 +28,7 @@ catch_events(const char *device, const char *event, void *data, Eudev_Watch *wat
28 if (strstr(device, name)) goto end; 28 if (strstr(device, name)) goto end;
29 29
30 /* check to see if the device was just plugged in */ 30 /* check to see if the device was just plugged in */
31 if (e_udev_syspath_is_kbd(device) || e_udev_syspath_is_mouse(device)) 31 if (eeze_udev_syspath_is_kbd(device) || eeze_udev_syspath_is_mouse(device))
32 { 32 {
33 new = 1; 33 new = 1;
34 goto end; 34 goto end;
@@ -46,7 +46,7 @@ end:
46 */ 46 */
47 if (new) 47 if (new)
48 { 48 {
49 dev = e_udev_syspath_get_devpath(device); 49 dev = eeze_udev_syspath_get_devpath(device);
50 type = "plugged in"; 50 type = "plugged in";
51 } 51 }
52 else 52 else
@@ -66,9 +66,9 @@ end:
66 /* and quit the main loop */ 66 /* and quit the main loop */
67 ecore_main_loop_quit(); 67 ecore_main_loop_quit();
68 /* and delete the watch */ 68 /* and delete the watch */
69 e_udev_watch_del(watch); 69 eeze_udev_watch_del(watch);
70 /* and shut down eudev */ 70 /* and shut down eudev */
71 e_udev_shutdown(); 71 eeze_udev_shutdown();
72} 72}
73 73
74static void 74static void
@@ -85,7 +85,7 @@ int main()
85 Eina_Hash *hash; 85 Eina_Hash *hash;
86 86
87 ecore_init(); 87 ecore_init();
88 e_udev_init(); 88 eeze_udev_init();
89 89
90 hash = eina_hash_stringshared_new(hash_free); 90 hash = eina_hash_stringshared_new(hash_free);
91 akbdmouse = malloc(sizeof(kbdmouse)); 91 akbdmouse = malloc(sizeof(kbdmouse));
@@ -93,10 +93,10 @@ int main()
93 93
94 printf("For my first trick, I will find all of your keyboards and return their syspaths.\n"); 94 printf("For my first trick, I will find all of your keyboards and return their syspaths.\n");
95 /* find all keyboards using type EUDEV_TYPE_KEYBOARD */ 95 /* find all keyboards using type EUDEV_TYPE_KEYBOARD */
96 type = e_udev_find_by_type(EUDEV_TYPE_KEYBOARD, NULL); 96 type = eeze_udev_find_by_type(EUDEV_TYPE_KEYBOARD, NULL);
97 EINA_LIST_FOREACH(type, l, name) 97 EINA_LIST_FOREACH(type, l, name)
98 { /* add the devpath to the hash for use in the cb later */ 98 { /* add the devpath to the hash for use in the cb later */
99 eina_hash_direct_add(hash, name, e_udev_syspath_get_devpath(name)); 99 eina_hash_direct_add(hash, name, eeze_udev_syspath_get_devpath(name));
100 printf("Found keyboard: %s\n", name); 100 printf("Found keyboard: %s\n", name);
101 } 101 }
102 /* we save this list for later, because once a device is unplugged it can 102 /* we save this list for later, because once a device is unplugged it can
@@ -107,11 +107,11 @@ int main()
107 107
108 printf("\nNext, I will find all of your mice and print the corresponding manufacturer.\n"); 108 printf("\nNext, I will find all of your mice and print the corresponding manufacturer.\n");
109 /* find all mice using type EUDEV_TYPE_MOUSE */ 109 /* find all mice using type EUDEV_TYPE_MOUSE */
110 type = e_udev_find_by_type(EUDEV_TYPE_MOUSE, NULL); 110 type = eeze_udev_find_by_type(EUDEV_TYPE_MOUSE, NULL);
111 EINA_LIST_FOREACH(type, l, name) 111 EINA_LIST_FOREACH(type, l, name)
112 { /* add the devpath to the hash for use in the cb later */ 112 { /* add the devpath to the hash for use in the cb later */
113 eina_hash_direct_add(hash, name, e_udev_syspath_get_devpath(name)); /* get a property using the device's syspath */ 113 eina_hash_direct_add(hash, name, eeze_udev_syspath_get_devpath(name)); /* get a property using the device's syspath */
114 printf("Found mouse %s with vendor: %s\n", name, e_udev_syspath_get_property(name, "ID_VENDOR")); 114 printf("Found mouse %s with vendor: %s\n", name, eeze_udev_syspath_get_property(name, "ID_VENDOR"));
115 } 115 }
116 /* we save this list for later, because once a device is unplugged it can 116 /* we save this list for later, because once a device is unplugged it can
117 * no longer be detected by udev, and any related properties are unusable unless 117 * no longer be detected by udev, and any related properties are unusable unless
@@ -121,13 +121,13 @@ int main()
121 121
122 printf("\nNow let's try something a little more difficult. Mountable filesystems!\n"); 122 printf("\nNow let's try something a little more difficult. Mountable filesystems!\n");
123 /* find all mountable drives using type EUDEV_TYPE_DRIVE_MOUNTABLE */ 123 /* find all mountable drives using type EUDEV_TYPE_DRIVE_MOUNTABLE */
124 type = e_udev_find_by_type(EUDEV_TYPE_DRIVE_MOUNTABLE, NULL); 124 type = eeze_udev_find_by_type(EUDEV_TYPE_DRIVE_MOUNTABLE, NULL);
125 EINA_LIST_FOREACH(type, l, name) 125 EINA_LIST_FOREACH(type, l, name)
126 { 126 {
127 printf("Found device: %s\n", name); /* get a property using the device's syspath */ 127 printf("Found device: %s\n", name); /* get a property using the device's syspath */
128 printf("\tYou probably know it better as %s\n", e_udev_syspath_get_property(name, "DEVNAME")); 128 printf("\tYou probably know it better as %s\n", eeze_udev_syspath_get_property(name, "DEVNAME"));
129 printf("\tIt's formatted as %s", e_udev_syspath_get_property(name, "ID_FS_TYPE")); 129 printf("\tIt's formatted as %s", eeze_udev_syspath_get_property(name, "ID_FS_TYPE"));
130 check = e_udev_syspath_get_property(name, "FSTAB_DIR"); 130 check = eeze_udev_syspath_get_property(name, "FSTAB_DIR");
131 if (check) 131 if (check)
132 printf(", and gets mounted at %s", check); 132 printf(", and gets mounted at %s", check);
133 printf("!\n"); 133 printf("!\n");
@@ -136,17 +136,17 @@ int main()
136 136
137 printf("\nInternal drives, anyone? With serial numbers?\n"); 137 printf("\nInternal drives, anyone? With serial numbers?\n");
138 /* find all internal drives using type EUDEV_TYPE_DRIVE_INTERNAL */ 138 /* find all internal drives using type EUDEV_TYPE_DRIVE_INTERNAL */
139 type = e_udev_find_by_type(EUDEV_TYPE_DRIVE_INTERNAL, NULL); 139 type = eeze_udev_find_by_type(EUDEV_TYPE_DRIVE_INTERNAL, NULL);
140 EINA_LIST_FOREACH(type, l, name) /* get a property using the device's syspath */ 140 EINA_LIST_FOREACH(type, l, name) /* get a property using the device's syspath */
141 printf("%s: %s\n", name, e_udev_syspath_get_property(name, "ID_SERIAL")); 141 printf("%s: %s\n", name, eeze_udev_syspath_get_property(name, "ID_SERIAL"));
142 eina_list_free(type); 142 eina_list_free(type);
143 143
144 printf("\nGot any removables? I'm gonna find em!\n"); 144 printf("\nGot any removables? I'm gonna find em!\n");
145 /* find all removable media using type EUDEV_TYPE_DRIVE_REMOVABLE */ 145 /* find all removable media using type EUDEV_TYPE_DRIVE_REMOVABLE */
146 type = e_udev_find_by_type(EUDEV_TYPE_DRIVE_REMOVABLE, NULL); 146 type = eeze_udev_find_by_type(EUDEV_TYPE_DRIVE_REMOVABLE, NULL);
147 EINA_LIST_FOREACH(type, l, name) /* get a property using the device's syspath */ 147 EINA_LIST_FOREACH(type, l, name) /* get a property using the device's syspath */
148 printf("\tOoh, a %s attached on your %s bus!\n", e_udev_syspath_get_property(name, "ID_MODEL"), 148 printf("\tOoh, a %s attached on your %s bus!\n", eeze_udev_syspath_get_property(name, "ID_MODEL"),
149 e_udev_syspath_get_property(name, "ID_BUS")); 149 eeze_udev_syspath_get_property(name, "ID_BUS"));
150 eina_list_free(type); 150 eina_list_free(type);
151 151
152 152
@@ -154,7 +154,7 @@ int main()
154 * set the events to be sent to callback function catch_events(), and attach 154 * set the events to be sent to callback function catch_events(), and attach
155 * kbdmouse to the watch as associated data 155 * kbdmouse to the watch as associated data
156 */ 156 */
157 e_udev_watch_add(EUDEV_TYPE_NONE, catch_events, akbdmouse); 157 eeze_udev_watch_add(EUDEV_TYPE_NONE, catch_events, akbdmouse);
158 printf("\nAnd now for something more complicated. Plug or unplug your keyboard or mouse for me.\n"); 158 printf("\nAnd now for something more complicated. Plug or unplug your keyboard or mouse for me.\n");
159 159
160 /* main loop must be started to use ecore fd polling */ 160 /* main loop must be started to use ecore fd polling */
diff --git a/legacy/eeze/src/lib/udev/E_Udev.h b/legacy/eeze/src/lib/udev/Eeze_Udev.h
index a084289dd5..92cfadbeaa 100644
--- a/legacy/eeze/src/lib/udev/E_Udev.h
+++ b/legacy/eeze/src/lib/udev/Eeze_Udev.h
@@ -1,5 +1,5 @@
1#ifndef E_UDEV_H 1#ifndef EEZE_UDEV_H
2#define E_UDEV_H 2#define EEZE_UDEV_H
3 3
4#include <Ecore.h> 4#include <Ecore.h>
5 5
@@ -109,26 +109,26 @@ typedef struct Eudev_Watch Eudev_Watch;
109extern "C" { 109extern "C" {
110#endif 110#endif
111 111
112 EAPI int e_udev_init(void); 112 EAPI int eeze_udev_init(void);
113 EAPI int e_udev_shutdown(void); 113 EAPI int eeze_udev_shutdown(void);
114 114
115 EAPI Eina_List *e_udev_find_by_type(const Eudev_Type type, const char *name); 115 EAPI Eina_List *eeze_udev_find_by_type(const Eudev_Type type, const char *name);
116 EAPI Eina_List *e_udev_find_by_filter(const char *subsystem, const char *type, const char *name); 116 EAPI Eina_List *eeze_udev_find_by_filter(const char *subsystem, const char *type, const char *name);
117 117
118 EAPI const char *e_udev_syspath_rootdev_get(const char *syspath); 118 EAPI const char *eeze_udev_syspath_rootdev_get(const char *syspath);
119 EAPI const char *e_udev_syspath_get_devpath(const char *syspath); 119 EAPI const char *eeze_udev_syspath_get_devpath(const char *syspath);
120 EAPI const char *e_udev_syspath_get_subsystem(const char *syspath); 120 EAPI const char *eeze_udev_syspath_get_subsystem(const char *syspath);
121 EAPI const char *e_udev_syspath_get_property(const char *syspath, const char *property); 121 EAPI const char *eeze_udev_syspath_get_property(const char *syspath, const char *property);
122 122
123 EAPI const char *e_udev_devpath_get_syspath(const char *devpath); 123 EAPI const char *eeze_udev_devpath_get_syspath(const char *devpath);
124 EAPI const char *e_udev_devpath_get_subsystem(const char *devpath); 124 EAPI const char *eeze_udev_devpath_get_subsystem(const char *devpath);
125 125
126 EAPI Eina_Bool e_udev_syspath_is_mouse(const char *syspath); 126 EAPI Eina_Bool eeze_udev_syspath_is_mouse(const char *syspath);
127 EAPI Eina_Bool e_udev_syspath_is_kbd(const char *syspath); 127 EAPI Eina_Bool eeze_udev_syspath_is_kbd(const char *syspath);
128 EAPI Eina_Bool e_udev_syspath_is_touchpad(const char *syspath); 128 EAPI Eina_Bool eeze_udev_syspath_is_touchpad(const char *syspath);
129 129
130 EAPI Eudev_Watch *e_udev_watch_add(Eudev_Type type, void(*func)(const char *, const char *, void *, Eudev_Watch *), void *user_data); 130 EAPI Eudev_Watch *eeze_udev_watch_add(Eudev_Type type, void(*func)(const char *, const char *, void *, Eudev_Watch *), void *user_data);
131 EAPI void *e_udev_watch_del(Eudev_Watch *watch); 131 EAPI void *eeze_udev_watch_del(Eudev_Watch *watch);
132 132
133#ifdef __cplusplus 133#ifdef __cplusplus
134} 134}
diff --git a/legacy/eeze/src/lib/udev/Makefile.am b/legacy/eeze/src/lib/udev/Makefile.am
index dccca18099..ea94e220e6 100644
--- a/legacy/eeze/src/lib/udev/Makefile.am
+++ b/legacy/eeze/src/lib/udev/Makefile.am
@@ -2,20 +2,20 @@ MAINTAINERCLEANFILES = Makefile.in
2 2
3AM_CPPFLAGS = @ECORE_CFLAGS@ 3AM_CPPFLAGS = @ECORE_CFLAGS@
4 4
5if BUILD_EUDEV 5if BUILD_EEZE_UDEV
6 6
7lib_LTLIBRARIES = libeudev.la 7lib_LTLIBRARIES = libeeze_udev.la
8include_HEADERS = E_Udev.h 8include_HEADERS = Eeze_Udev.h
9 9
10noinst_HEADERS = e_udev_private.h 10noinst_HEADERS = eeze_udev_private.h
11 11
12libeudev_la_SOURCES = \ 12libeeze_udev_la_SOURCES = \
13E_Udev.h \ 13Eeze_Udev.h \
14e_udev.c \ 14eeze_udev.c \
15e_udev_watch.c \ 15eeze_udev_watch.c \
16e_udev_main.c 16eeze_udev_main.c
17 17
18libeudev_la_LIBADD = @ECORE_LIBS@ @UDEV_LIBS@ 18libeeze_udev_la_LIBADD = @ECORE_LIBS@ @UDEV_LIBS@
19libeudev_la_LDFLAGS = -no-undefined -version-info @version_info@ @eudev_release_info@ 19libeeze_udev_la_LDFLAGS = -no-undefined -version-info @version_info@ @eeze_udev_release_info@
20 20
21endif 21endif
diff --git a/legacy/eeze/src/lib/udev/e_udev.c b/legacy/eeze/src/lib/udev/eeze_udev.c
index 6fb55217bc..8c740b9397 100644
--- a/legacy/eeze/src/lib/udev/e_udev.c
+++ b/legacy/eeze/src/lib/udev/eeze_udev.c
@@ -1,5 +1,5 @@
1#include "e_udev_private.h" 1#include "eeze_udev_private.h"
2#include <E_Udev.h> 2#include <Eeze_Udev.h>
3 3
4/** 4/**
5 * @defgroup udev udev 5 * @defgroup udev udev
@@ -18,7 +18,7 @@
18 * @ingroup udev 18 * @ingroup udev
19 */ 19 */
20EAPI const char * 20EAPI const char *
21e_udev_syspath_rootdev_get(const char *syspath) 21eeze_udev_syspath_rootdev_get(const char *syspath)
22{ 22{
23 struct udev *udev; 23 struct udev *udev;
24 struct udev_device *device, *parent; 24 struct udev_device *device, *parent;
@@ -51,7 +51,7 @@ e_udev_syspath_rootdev_get(const char *syspath)
51 * @ingroup udev 51 * @ingroup udev
52 */ 52 */
53EAPI Eina_List * 53EAPI Eina_List *
54e_udev_find_by_type(const Eudev_Type etype, const char *name) 54eeze_udev_find_by_type(const Eudev_Type etype, const char *name)
55{ 55{
56 struct udev *udev; 56 struct udev *udev;
57 struct udev_enumerate *en; 57 struct udev_enumerate *en;
@@ -157,7 +157,7 @@ out:
157 * @ingroup udev 157 * @ingroup udev
158 */ 158 */
159EAPI Eina_List * 159EAPI Eina_List *
160e_udev_find_by_filter(const char *subsystem, const char *type, const char *name) 160eeze_udev_find_by_filter(const char *subsystem, const char *type, const char *name)
161{ 161{
162 struct udev *udev; 162 struct udev *udev;
163 struct udev_enumerate *en; 163 struct udev_enumerate *en;
@@ -212,7 +212,7 @@ out:
212 * @ingroup udev 212 * @ingroup udev
213 */ 213 */
214EAPI const char * 214EAPI const char *
215e_udev_syspath_get_devpath(const char *syspath) 215eeze_udev_syspath_get_devpath(const char *syspath)
216{ 216{
217 struct udev *udev; 217 struct udev *udev;
218 struct udev_device *device; 218 struct udev_device *device;
@@ -250,7 +250,7 @@ e_udev_syspath_get_devpath(const char *syspath)
250 * @ingroup udev 250 * @ingroup udev
251 */ 251 */
252EAPI const char * 252EAPI const char *
253e_udev_syspath_get_subsystem(const char *syspath) 253eeze_udev_syspath_get_subsystem(const char *syspath)
254{ 254{
255 struct udev *udev; 255 struct udev *udev;
256 struct udev_device *device; 256 struct udev_device *device;
@@ -289,7 +289,7 @@ e_udev_syspath_get_subsystem(const char *syspath)
289 * @ingroup udev 289 * @ingroup udev
290 */ 290 */
291EAPI const char * 291EAPI const char *
292e_udev_syspath_get_property(const char *syspath, const char *property) 292eeze_udev_syspath_get_property(const char *syspath, const char *property)
293{ 293{
294 struct udev *udev; 294 struct udev *udev;
295 struct udev_device *device; 295 struct udev_device *device;
@@ -326,7 +326,7 @@ e_udev_syspath_get_property(const char *syspath, const char *property)
326 * @ingroup udev 326 * @ingroup udev
327 */ 327 */
328EAPI const char * 328EAPI const char *
329e_udev_devpath_get_syspath(const char *devpath) 329eeze_udev_devpath_get_syspath(const char *devpath)
330{ 330{
331 struct udev *udev; 331 struct udev *udev;
332 struct udev_enumerate *en; 332 struct udev_enumerate *en;
@@ -370,7 +370,7 @@ e_udev_devpath_get_syspath(const char *devpath)
370 * @ingroup udev 370 * @ingroup udev
371 */ 371 */
372EAPI const char * 372EAPI const char *
373e_udev_devpath_get_subsystem(const char *devpath) 373eeze_udev_devpath_get_subsystem(const char *devpath)
374{ 374{
375 struct udev *udev; 375 struct udev *udev;
376 struct udev_enumerate *en; 376 struct udev_enumerate *en;
@@ -412,7 +412,7 @@ e_udev_devpath_get_subsystem(const char *devpath)
412 * @ingroup udev 412 * @ingroup udev
413 */ 413 */
414EAPI Eina_Bool 414EAPI Eina_Bool
415e_udev_syspath_is_mouse(const char *syspath) 415eeze_udev_syspath_is_mouse(const char *syspath)
416{ 416{
417 struct udev *udev; 417 struct udev *udev;
418 struct udev_device *device; 418 struct udev_device *device;
@@ -448,7 +448,7 @@ e_udev_syspath_is_mouse(const char *syspath)
448 * @ingroup udev 448 * @ingroup udev
449 */ 449 */
450EAPI Eina_Bool 450EAPI Eina_Bool
451e_udev_syspath_is_kbd(const char *syspath) 451eeze_udev_syspath_is_kbd(const char *syspath)
452{ 452{
453 struct udev *udev; 453 struct udev *udev;
454 struct udev_device *device; 454 struct udev_device *device;
@@ -484,7 +484,7 @@ e_udev_syspath_is_kbd(const char *syspath)
484 * @ingroup udev 484 * @ingroup udev
485 */ 485 */
486EAPI Eina_Bool 486EAPI Eina_Bool
487e_udev_syspath_is_touchpad(const char *syspath) 487eeze_udev_syspath_is_touchpad(const char *syspath)
488{ 488{
489 struct udev *udev; 489 struct udev *udev;
490 struct udev_device *device; 490 struct udev_device *device;
diff --git a/legacy/eeze/src/lib/udev/e_udev_main.c b/legacy/eeze/src/lib/udev/eeze_udev_main.c
index 5a946302e5..38d665a508 100644
--- a/legacy/eeze/src/lib/udev/e_udev_main.c
+++ b/legacy/eeze/src/lib/udev/eeze_udev_main.c
@@ -1,11 +1,11 @@
1#include "e_udev_private.h" 1#include "eeze_udev_private.h"
2#include <E_Udev.h> 2#include <Eeze_Udev.h>
3 3
4int _e_eeze_udev_log_dom = -1; 4int _e_eeze_udev_log_dom = -1;
5int _e_eeze_udev_init_count = 0; 5int _e_eeze_udev_init_count = 0;
6 6
7EAPI int 7EAPI int
8e_udev_init(void) 8eeze_udev_init(void)
9{ 9{
10 if (++_e_eeze_udev_init_count != 1) 10 if (++_e_eeze_udev_init_count != 1)
11 return _e_eeze_udev_init_count; 11 return _e_eeze_udev_init_count;
@@ -14,10 +14,10 @@ e_udev_init(void)
14 return --_e_eeze_udev_init_count; 14 return --_e_eeze_udev_init_count;
15 15
16 _e_eeze_udev_log_dom = eina_log_domain_register 16 _e_eeze_udev_log_dom = eina_log_domain_register
17 ("e_udev", E_EEZE_COLOR_DEFAULT); 17 ("eeze_udev", E_EEZE_COLOR_DEFAULT);
18 if (_e_eeze_udev_log_dom < 0) 18 if (_e_eeze_udev_log_dom < 0)
19 { 19 {
20 EINA_LOG_ERR("Could not register 'e_udev' log domain."); 20 EINA_LOG_ERR("Could not register 'eeze_udev' log domain.");
21 goto shutdown_eina; 21 goto shutdown_eina;
22 } 22 }
23 23
@@ -32,7 +32,7 @@ e_udev_init(void)
32} 32}
33 33
34EAPI int 34EAPI int
35e_udev_shutdown(void) 35eeze_udev_shutdown(void)
36{ 36{
37 if (--_e_eeze_udev_init_count != 0) 37 if (--_e_eeze_udev_init_count != 0)
38 return _e_eeze_udev_init_count; 38 return _e_eeze_udev_init_count;
diff --git a/legacy/eeze/src/lib/udev/e_udev_private.h b/legacy/eeze/src/lib/udev/eeze_udev_private.h
index f6c853000f..d169a52f97 100644
--- a/legacy/eeze/src/lib/udev/e_udev_private.h
+++ b/legacy/eeze/src/lib/udev/eeze_udev_private.h
@@ -1,5 +1,5 @@
1#ifndef E_UDEV_PRIVATE_H 1#ifndef EEZE_UDEV_PRIVATE_H
2#define E_UDEV_PRIVATE_H 2#define EEZE_UDEV_PRIVATE_H
3 3
4#ifndef E_EEZE_COLOR_DEFAULT 4#ifndef E_EEZE_COLOR_DEFAULT
5#define E_EEZE_COLOR_DEFAULT EINA_COLOR_CYAN 5#define E_EEZE_COLOR_DEFAULT EINA_COLOR_CYAN
diff --git a/legacy/eeze/src/lib/udev/e_udev_watch.c b/legacy/eeze/src/lib/udev/eeze_udev_watch.c
index f853c10064..eed7564ec8 100644
--- a/legacy/eeze/src/lib/udev/e_udev_watch.c
+++ b/legacy/eeze/src/lib/udev/eeze_udev_watch.c
@@ -1,5 +1,5 @@
1#include "e_udev_private.h" 1#include "eeze_udev_private.h"
2#include <E_Udev.h> 2#include <Eeze_Udev.h>
3 3
4/* opaque */ 4/* opaque */
5struct Eudev_Watch 5struct Eudev_Watch
@@ -129,7 +129,7 @@ error:
129 * @ingroup udev 129 * @ingroup udev
130 */ 130 */
131EAPI Eudev_Watch * 131EAPI Eudev_Watch *
132e_udev_watch_add(Eudev_Type type, void(*func)(const char *, const char *, void *, Eudev_Watch *), void *user_data) 132eeze_udev_watch_add(Eudev_Type type, void(*func)(const char *, const char *, void *, Eudev_Watch *), void *user_data)
133{ 133{
134 struct udev *udev; 134 struct udev *udev;
135 struct udev_monitor *mon; 135 struct udev_monitor *mon;
@@ -218,7 +218,7 @@ error:
218 * @ingroup udev 218 * @ingroup udev
219 */ 219 */
220EAPI void * 220EAPI void *
221e_udev_watch_del(Eudev_Watch *watch) 221eeze_udev_watch_del(Eudev_Watch *watch)
222{ 222{
223 struct udev *udev; 223 struct udev *udev;
224 struct udev_monitor *mon = watch->mon; 224 struct udev_monitor *mon = watch->mon;