Hello,
Herewith the patch that corrects some of my mistakes since I did not try
the -fvisibility=hidden option. The compilation is fine now with this
patch (except the e_nm module which is not activated by default). Really
sorry for this break. Of course it should be applied to the svn trunk
after a cehcking it :-).
best
Mathieu
On 09/22/09 13:22, Viktor Kojouharov wrote:
On Tue, 2009-09-22 at 09:37 +0200, Mathieu Taillefumier wrote:
Hello,
I'm not able to compile evas with -fvisibility=hidden:
evas_cserve_main.o: In function `main':
evas_cserve_main.c:(.text+0x4b7a): undefined reference to
`_evas_log_dom_global'
It is my fault WRN macros was used only one time that is why the
compiler is complaining (I picked the one defined for the ecore lib).
This patch should fix it.
--
Mathieu
please look at e_dbus as well. it fails with a similar error.
Index: src/lib/hal/e_hal_device.c
===================================================================
--- src/lib/hal/e_hal_device.c (revision 42618)
+++ src/lib/hal/e_hal_device.c (working copy)
@@ -140,7 +140,7 @@
}
break;
default:
- E_DBUS_LOG_WARN("Ehal Error: unexpected property type (%s): %c", name,
dbus_message_iter_get_arg_type(&v_iter));
+ EINA_LOG_WARN("Ehal Error: unexpected property type (%s): %c", name,
dbus_message_iter_get_arg_type(&v_iter));
break;
}
eina_hash_add(ret->properties, name, prop);
Index: src/lib/notification/client.c
===================================================================
--- src/lib/notification/client.c (revision 42618)
+++ src/lib/notification/client.c (working copy)
@@ -1,6 +1,5 @@
#include "E_Notify.h"
#include "e_notify_private.h"
-#include "e_dbus_private.h"
static E_DBus_Connection *client_conn;
static int init_count = 0;
@@ -19,11 +18,11 @@
return 0;
}
- _e_dbus_notification_log_dom =
eina_log_domain_register("e_dbus_notification",E_DBUS_COLOR_DEFAULT);
+ _e_dbus_notification_log_dom =
eina_log_domain_register("e_dbus_notification",EINA_COLOR_GREEN);
if(_e_dbus_notification_log_dom < 0)
{
- E_DBUS_LOG_ERR("E-Dbus-notification Error: Impossible to create
e_dbus_motification domain");
+ EINA_LOG_ERR("E-Dbus-notification Error: Impossible to create
e_dbus_motification domain");
e_dbus_shutdown();
return 0;
}
Index: src/lib/notification/daemon.c
===================================================================
--- src/lib/notification/daemon.c (revision 42618)
+++ src/lib/notification/daemon.c (working copy)
@@ -1,7 +1,6 @@
#include "E_Notify.h"
#include "E_Notification_Daemon.h"
#include "e_notify_private.h"
-#include "e_dbus_private.h"
#include <string.h>
static int e_notification_daemon_bus_init(E_Notification_Daemon *daemon);
Index: src/lib/connman/e_connman_private.h
===================================================================
--- src/lib/connman/e_connman_private.h (revision 42618)
+++ src/lib/connman/e_connman_private.h (working copy)
@@ -58,12 +58,12 @@
if (!msg)
{
if (err)
- ERROR(file, function, line,
+ ERR(file, function, line,
"an error was reported by server: "
"name=\"%s\", message=\"%s\"",
err->name, err->message);
else
- ERROR(file, function, line,
+ ERR(file, function, line,
"callback without message arguments!");
return 0;
@@ -71,7 +71,7 @@
if (!dbus_message_iter_init(msg, itr))
{
- ERROR(file, function, line,
+ ERR(file, function, line,
"could not init iterator.");
return 0;
}
@@ -89,7 +89,7 @@
if (type == expected)
return 1;
- ERROR(file, function, line,
+ ERR(file, function, line,
"expected type %s (%c) but got %c instead!",
expected_name, expected, type);
Index: src/lib/connman/e_connman.c
===================================================================
--- src/lib/connman/e_connman.c (revision 42618)
+++ src/lib/connman/e_connman.c (working copy)
@@ -54,7 +54,7 @@
const char *e_connman_prop_wifi_passphrase = NULL;
const char *e_connman_prop_wifi_security = NULL;
const char *e_connman_prop_wifi_ssid = NULL;
-
+int _e_dbus_connman_log_dom = -1;
const char *
e_connman_system_bus_name_get(void)
{
@@ -221,11 +221,11 @@
if (init_count > 1)
return init_count;
- _e_dbus_connman_log_dom =
eina_log_domain_register("e_dbus_connman",EINA_LOG_DEFAULT_COLOR);
+ _e_dbus_connman_log_dom =
eina_log_domain_register("e_dbus_connman",EINA_COLOR_GREEN);
if(_e_dbus_connman_log_dom < 0)
{
- E_DBUS_LOG_ERR("E-Dbus connman error : impossible to create a log
domain for edbus_connman module");
+ EINA_LOG_ERR("E-Dbus connman error : impossible to create a log domain
for edbus_connman module");
return -1;
}
@@ -344,7 +344,7 @@
{
if (init_count == 0)
{
- E_DBUS_LOG_ERR("E-Dbus connman Error: connman system already shut
down.");
+ EINA_LOG_ERR("E-Dbus connman Error: connman system already shut down.");
return 0;
}
init_count--;
Index: src/lib/dbus/e_dbus_private.h
===================================================================
--- src/lib/dbus/e_dbus_private.h (revision 42618)
+++ src/lib/dbus/e_dbus_private.h (working copy)
@@ -5,14 +5,45 @@
#include "Ecore_Data.h"
#include "eina_log.h"
-#define E_DBUS_COLOR_DEFAULT "\033[36m"
+#define _E_DBUS_MOD_DEFAULT_LOG_DOM _E_DBUS_LOG_DOM_GLOBAL
+#define E_DBUS_COLOR_DEFAULT EINA_COLOR_GREEN
extern int _E_DBUS_LOG_DOM_GLOBAL ;
+#ifdef E_DBUS_LOG_DBG
+#undef E_DBUS_LOG_DBG
+#endif
+#ifdef E_DBUS_LOG_INFO
+#undef E_DBUS_LOG_INFO
+#endif
+#ifdef E_DBUS_LOG_WARN
+#undef E_DBUS_LOG_WARN
+#endif
+#ifdef E_DBUS_LOG_DBG
+#undef E_DBUS_LOG_DBG
+#endif
+#ifdef E_DBUS_LOG_ERR
+#undef E_DBUS_LOG_ERR
+#endif
#define E_DBUS_LOG_DBG(...) EINA_LOG_DOM_DBG(_E_DBUS_LOG_DOM_GLOBAL ,
__VA_ARGS__)
#define E_DBUS_LOG_INFO(...) EINA_LOG_DOM_INFO(_E_DBUS_LOG_DOM_GLOBAL ,
__VA_ARGS__)
#define E_DBUS_LOG_WARN(...) EINA_LOG_DOM_WARN(_E_DBUS_LOG_DOM_GLOBAL ,
__VA_ARGS__)
#define E_DBUS_LOG_ERR(...) EINA_LOG_DOM_ERR(_E_DBUS_LOG_DOM_GLOBAL ,
__VA_ARGS__)
+#ifdef DBG
+#undef DBG
+#endif
+#ifdef INFO
+#undef INFO
+#endif
+#ifdef WRN
+#undef WRN
+#endif
+#ifdef ERR
+#undef ERR
+#endif
+#define DBG(...) EINA_LOG_DOM_DBG( _E_DBUS_MOD_DEFAULT_LOG_DOM , __VA_ARGS__)
+#define INFO(...) EINA_LOG_DOM_INFO( _E_DBUS_MOD_DEFAULT_LOG_DOM ,
__VA_ARGS__)
+#define WRN(...) EINA_LOG_DOM_WARN( _E_DBUS_MOD_DEFAULT_LOG_DOM , __VA_ARGS__)
+#define ERR(...) EINA_LOG_DOM_ERR( _E_DBUS_MOD_DEFAULT_LOG_DOM , __VA_ARGS__)
-
struct E_DBus_Connection
{
DBusBusType shared_type;
Index: src/bin/notify-send.c
===================================================================
--- src/bin/notify-send.c (revision 42618)
+++ src/bin/notify-send.c (working copy)
@@ -6,18 +6,38 @@
#include <getopt.h>
#include <E_Notify.h>
+static int _notify_send_log_dom = -1;
+#ifdef DBG
+#undef DBG
+#endif
+#ifdef INFO
+#undef INFO
+#endif
+#ifdef WARN
+#undef WARN
+#endif
+#ifdef ERR
+#undef ERR
+#endif
+#define DBG(...) EINA_LOG_DOM_DBG(_notify_send_log_dom, __VA_ARGS__)
+#define INFO(...) EINA_LOG_DOM_INFO(_notify_send_log_dom, __VA_ARGS__)
+#define WARN(...) EINA_LOG_DOM_WARN(_notify_send_log_dom , __VA_ARGS__)
+#define ERR(...) EINA_LOG_DOM_ERR(_notify_send_log_dom , __VA_ARGS__)
+#undef NOTIFY_SEND_DEFAULT_LOG_COLOR
+#define NOTIFY_SEND_DEFAULT_LOG_COLOR EINA_COLOR_GREEN
+
#include "config.h"
void
version(void)
{
- printf("e-notify-send "VERSION"\n");
+ INFO("e-notify-send "VERSION"\n");
}
void
usage(void)
{
- printf("Usage:\n"
+ INFO("Usage:\n"
" e-notify-send [OPTION...] <SUMMARY> [BODY] - create a
notification\n"
"\n"
"Help Options:\n"
@@ -44,12 +64,12 @@
*result = strtoll(optarg, &endptr, 10);
if ((errno != 0 && *result == 0) || endptr == optarg)
{
- fprintf(stderr, "Cannot parse integer value '%s' for %s\n", optarg,
name);
+ ERR("Cannot parse integer value '%s' for %s\n", optarg, name);
return 0;
}
else if (*result > max || *result < min)
{
- fprintf(stderr, "Integer value '%s' for %s out of range\n", optarg,
name);
+ ERR("Integer value '%s' for %s out of range\n", optarg, name);
return 0;
}
@@ -64,7 +84,7 @@
if(!r)
return;
- printf("%u\n", r->notification_id );
+ INFO("%u\n", r->notification_id );
ecore_main_loop_quit();
}
@@ -76,7 +96,14 @@
long long value;
int print_id = 0;
E_Notification *n;
-
+ eina_init();
+ _notify_send_log_dom =
eina_log_domain_register("Notify_send",NOTIFY_SEND_DEFAULT_LOG_COLOR);
+ if(_notify_send_log_dom < 0)
+ {
+ EINA_LOG_ERR("Impossible to create a log domain for the application.\n");
+ eina_shutdown();
+ return 1;
+ }
e_notification_init();
n = e_notification_new();
e_notification_app_name_set(n, "e-notify-send");
Index: src/bin/e_dbus_connman_test_api.c
===================================================================
--- src/bin/e_dbus_connman_test_api.c (revision 42618)
+++ src/bin/e_dbus_connman_test_api.c (working copy)
@@ -2,10 +2,10 @@
#include <stdio.h>
#include <string.h>
-#define DBG(...) EINA_ERROR_PDBG(__VA_ARGS__)
-#define INF(...) EINA_ERROR_PINFO(__VA_ARGS__)
-#define WRN(...) EINA_ERROR_PWARN(__VA_ARGS__)
-#define ERR(...) EINA_ERROR_PERR(__VA_ARGS__)
+#define DBG(...) EINA_LOG_DBG(__VA_ARGS__)
+#define INF(...) EINA_LOG_INFO(__VA_ARGS__)
+#define WRN(...) EINA_LOG_WARN(__VA_ARGS__)
+#define ERR(...) EINA_LOG_ERR(__VA_ARGS__)
static int success = 0;
static int failure = 0;
@@ -535,9 +535,9 @@
total = success + failure;
if (total == 0)
- fputs("DBG: clean exit, no tests executed.\n", stderr);
+ INF("DBG: clean exit, no tests executed.\n");
else
- fprintf(stderr, "DBG: clean exit, success: %d, failure: %d, %d%%\n",
+ INF("DBG: clean exit, success: %d, failure: %d, %d%%\n",
success, failure, (success * 100) / total);
return 0;
Index: src/bin/hal.c
===================================================================
--- src/bin/hal.c (revision 42618)
+++ src/bin/hal.c (working copy)
@@ -11,6 +11,26 @@
/* test app */
+int edbus_test_hal_log_dom = -1;
+#ifdef DBG
+#undef DBG
+#endif
+#ifdef INFO
+#undef INFO
+#endif
+#ifdef WARN
+#undef WARN
+#endif
+#ifdef ERR
+#undef ERR
+#endif
+#define DBG(...) EINA_LOG_DOM_DBG(edbus_test_hal_log_dom, __VA_ARGS__)
+#define INFO(...) EINA_LOG_DOM_INFO(edbus_test_hal_log_dom, __VA_ARGS__)
+#define WARN(...) EINA_LOG_DOM_WARN(edbus_test_hal_log_dom , __VA_ARGS__)
+#define ERR(...) EINA_LOG_DOM_ERR(edbus_test_hal_log_dom , __VA_ARGS__)
+#undef HAL_TEST_DEFAULT_COLOR
+#define HAL_TEST_DEFAULT_COLOR EINA_COLOR_GREEN
+
static E_DBus_Connection *conn;
#if EWL_GUI
static int mount_id = 0;
@@ -100,7 +120,7 @@
{
Volume *v;
Eina_List *l;
- E_DBUS_LOG_INFO("storage_free: %s", storage->udi);
+ INFO("storage_free: %s", storage->udi);
/* disconnect storage from volume */
EINA_LIST_FOREACH(storage->volumes, l, v)
@@ -364,7 +384,7 @@
{
Volume *v;
if (!udi) return NULL;
- E_DBUS_LOG_INFO("ADDING %s", udi);
+ INFO("ADDING %s", udi);
v = volume_new();
v->udi = strdup(udi);
volumes = eina_list_append(volumes, v);
@@ -394,7 +414,7 @@
EINA_LIST_FOREACH(ret->strings, l, device)
{
- E_DBUS_LOG_INFO("device: %s", device);
+ INFO("device: %s", device);
}
}
@@ -488,7 +508,7 @@
dbus_error_init(&err);
dbus_message_get_args(msg, &err, DBUS_TYPE_STRING, &udi, DBUS_TYPE_INVALID);
udi = strdup(udi);
- E_DBUS_LOG_INFO("Ehal: Device added: %s", udi);
+ INFO("Ehal: Device added: %s", udi);
ret = e_hal_device_query_capability(conn, udi, "storage", cb_is_storage,
strdup(udi));
e_hal_device_query_capability(conn, udi, "volume", cb_is_volume,
strdup(udi));
}
@@ -502,7 +522,7 @@
dbus_error_init(&err);
dbus_message_get_args(msg, &err, DBUS_TYPE_STRING, &udi, DBUS_TYPE_INVALID);
- E_DBUS_LOG_INFO("Removed: %s", udi);
+ INFO("Removed: %s", udi);
storage_remove(udi);
volume_remove(udi);
}
@@ -541,7 +561,7 @@
{
Volume *vol = user_data;
vol->mounted = 0;
- E_DBUS_LOG_INFO("Volume unmounted reply: %s", vol->udi);
+ INFO("Volume unmounted reply: %s", vol->udi);
}
static void
@@ -549,7 +569,7 @@
{
Volume *vol = user_data;
vol->mounted = 1;
- E_DBUS_LOG_INFO("Volume mounted reply: %s", vol->udi);
+ INFO("Volume mounted reply: %s", vol->udi);
}
static void
@@ -558,7 +578,7 @@
Device *dev = data;
char buf[4096];
- E_DBUS_LOG_INFO("Device clicked: %s", dev->udi);
+ INFO("Device clicked: %s", dev->udi);
if (dev->type == DEVICE_TYPE_VOLUME)
{
Volume *vol = (Volume *)dev;
@@ -584,7 +604,7 @@
mount_point = buf;
}
- E_DBUS_LOG_INFO("Attempting to mount %s to %s", vol->udi, mount_point);
+ INFO("Attempting to mount %s to %s", vol->udi, mount_point);
e_hal_device_volume_mount(conn, vol->udi, mount_point, vol->fstype,
NULL, cb_volume_mounted, vol);
}
}
@@ -793,21 +813,29 @@
ecore_init();
eina_init();
+ edbus_test_hal_log_dom = eina_log_domain_register("E_dbus_hal_test",
HAL_TEST_DEFAULT_COLOR);
+ if(edbus_test_hal_log_dom < 0)
+ {
+ EINA_LOG_ERR("Impossible to create a log domain for the application.\n");
+ eina_shutdown();
+ ecore_shutdown();
+ return 1;
+ }
e_dbus_init();
#if EWL_GUI
efreet_init();
if (!ewl_init(&argc, argv))
- {
- E_DBUS_LOG_INFO(stderr, "Unable to init EWL.");
- return 1;
- }
+ {
+ INFO("Unable to init EWL.");
+ return 1;
+ }
#endif
conn = e_dbus_bus_get(DBUS_BUS_SYSTEM);
if (!conn)
{
- E_DBUS_LOG_INFO(stderr, "Error connecting to system bus. Is it running?");
+ INFO("Error connecting to system bus. Is it running?");
return 1;
}
@@ -848,6 +876,7 @@
}
e_dbus_connection_close(conn);
e_dbus_shutdown();
+ eina_log_domain_unregister(edbus_test_hal_log_dom);
eina_shutdown();
ecore_shutdown();
return 1;
Index: src/bin/notify.c
===================================================================
--- src/bin/notify.c (revision 42618)
+++ src/bin/notify.c (working copy)
@@ -1,6 +1,26 @@
#include <E_DBus.h>
#include <E_Notify.h>
+static int _notify_log_dom = -1;
+#ifdef DBG
+#undef DBG
+#endif
+#ifdef INFO
+#undef INFO
+#endif
+#ifdef WARN
+#undef WARN
+#endif
+#ifdef ERR
+#undef ERR
+#endif
+#define DBG(...) EINA_LOG_DOM_DBG(_notify_log_dom, __VA_ARGS__)
+#define INFO(...) EINA_LOG_DOM_INFO(_notify_log_dom, __VA_ARGS__)
+#define WARN(...) EINA_LOG_DOM_WARN(_notify_log_dom , __VA_ARGS__)
+#define ERR(...) EINA_LOG_DOM_ERR(_notify_log_dom , __VA_ARGS__)
+#undef NOTIFY_DEFAULT_LOG_COLOR
+#define NOTIFY_DEFAULT_LOG_COLOR EINA_COLOR_GREEN
+
void
cb_sent(void *data, void *ret, DBusError *err)
{
@@ -8,11 +28,11 @@
notify = ret;
if (notify)
{
- printf("id: %d\n", notify->notification_id);
+ INFO("id: %d\n", notify->notification_id);
}
else if (dbus_error_is_set(err))
{
- printf("Error: %s\n", err->message);
+ ERR("%s\n", err->message);
}
free(notify);
@@ -45,7 +65,7 @@
E_Notification_Event_Action_Invoked *ev;
ev = event;
- printf("Action (%d): %s\n", ev->notification_id, ev->action_id);
+ INFO("Action (%d): %s\n", ev->notification_id, ev->action_id);
free(ev);
}
@@ -61,7 +81,7 @@
};
ev = event;
- printf("Note %d closed: %s\n", ev->notification_id, reasons[ev->reason]);
+ INFO("Note %d closed: %s\n", ev->notification_id, reasons[ev->reason]);
free(ev);
}
@@ -69,7 +89,16 @@
main(int argc, char **argv)
{
int ret = 0;
+ eina_init();
ecore_init();
+ _notify_log_dom =
eina_log_domain_register("Notify",NOTIFY_DEFAULT_LOG_COLOR);
+ if(_notify_log_dom < 0)
+ {
+ EINA_LOG_ERR("Impossible to create a log domain for the application.\n");
+ ecore_shutdown();
+ eina_shutdown();
+ return 1;
+ }
if (e_notification_init())
{
ecore_timer_add(1, cb_timer, NULL);
Index: src/bin/nm.c
===================================================================
--- src/bin/nm.c (revision 42618)
+++ src/bin/nm.c (working copy)
@@ -4,6 +4,26 @@
#include <unistd.h>
#include <string.h>
+static int edbus_test_nm_log_dom = -1;
+#ifdef DBG
+#undef DBG
+#endif
+#ifdef INFO
+#undef INFO
+#endif
+#ifdef WARN
+#undef WARN
+#endif
+#ifdef ERR
+#undef ERR
+#endif
+#define DBG(...) EINA_LOG_DOM_DBG(edbus_test_nm_log_dom, __VA_ARGS__)
+#define INFO(...) EINA_LOG_DOM_INFO(edbus_test_nm_log_dom, __VA_ARGS__)
+#define WARN(...) EINA_LOG_DOM_WARN(edbus_test_nm_log_dom , __VA_ARGS__)
+#define ERR(...) EINA_LOG_DOM_ERR(edbus_test_nm_log_dom , __VA_ARGS__)
+#undef NM_TEST_DEFAULT_COLOR
+#define NM_TEST_DEFAULT_COLOR EINA_COLOR_GREY
+
E_NM *nm = NULL;
E_NMS *nms = NULL;
@@ -26,33 +46,33 @@
case 'a': {
E_NM_Variant *subvar;
- printf("a:");
+ INFO("a:");
ecore_list_first_goto(var->a);
while ((subvar = ecore_list_next(var->a)))
{
dump_variant(subvar);
- printf(";");
+ INFO(";");
}
- printf("\n");
+ INFO("\n");
break;
}
case 's':
- printf("s:%s", var->s);
+ INFO("s:%s", var->s);
break;
case 'o':
- printf("o:%s", var->s);
+ INFO("o:%s", var->s);
break;
case 'u':
- printf("u:%d", var->u);
+ INFO("u:%d", var->u);
break;
case 'b':
- printf("b:%d", var->b);
+ INFO("b:%d", var->b);
break;
case 'y':
- printf("y:%d", var->y);
+ INFO("y:%d", var->y);
break;
case 't':
- printf("t:%lld", var->t);
+ INFO("t:%lld", var->t);
break;
}
}
@@ -60,24 +80,24 @@
static Eina_Bool
dump_values(const Eina_Hash *hash, const void *key, void *value, void *data)
{
- printf(" - name: %s - ", (char *)key);
+ INFO(" - name: %s - ", (char *)key);
dump_variant(value);
- printf("\n");
+ INFO("\n");
}
static Eina_Bool
dump_settings(const Eina_Hash *hash, const void *key, void *value, void *fdata)
{
- printf("name: %s\n", (char *)key);
- printf("values:\n");
+ INFO("name: %s\n", (char *)key);
+ INFO("values:\n");
eina_hash_foreach(value, dump_values, NULL);
- printf("\n");
+ INFO("\n");
}
static int
cb_nms_connection_secrets(void *data, Ecore_Hash *secrets)
{
- printf("Secrets:\n");
+ INFO("Secrets:\n");
if (secrets)
eina_hash_foreach(secrets, dump_settings, NULL);
return 1;
@@ -86,7 +106,7 @@
static int
cb_nms_connection_settings(void *data, Ecore_Hash *settings)
{
- printf("Settings:\n");
+ INFO("Settings:\n");
if (settings)
{
if (ecore_hash_get(settings, "802-11-wireless-security"))
@@ -322,17 +342,25 @@
ecore_init();
eina_init();
e_dbus_init();
-
+ edbus_test_nm_log_dom = eina_log_domain_register("Edbus_nm_test",
E_DBUS_NM_TEST_DEFALT_COLOR);
+ if(edbus_test_nm_log_dom < 0)
+ {
+ EINA_LOG_ERR("Error creating a log domain for the application.\n");
+ e_dbus_shutdown();
+ eina_shutdown();
+ ecore_shutdown();
+ return 1;
+ }
if (!e_nm_get(cb_nm, (void *)0xdeadbeef))
{
- printf("Error connecting to system bus. Is it running?\n");
+ ERR("Error connecting to system bus. Is it running?\n");
return 1;
}
ecore_main_loop_begin();
e_nms_free(nms);
e_nm_free(nm);
-
+ eina_log_domain_unregister(edbus_test_nm_log_dom);
e_dbus_shutdown();
eina_shutdown();
ecore_shutdown();
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
