[Ebdl-commits] SF.net SVN: ebdl:[807] trunk/ebdl
Status: Beta
Brought to you by:
inean
Menu
▾
▴
[Ebdl-commits] SF.net SVN: ebdl:[807] trunk/ebdl
|
From: <in...@us...> - 2008-09-11 17:18:37
|
Revision: 807
http://ebdl.svn.sourceforge.net/ebdl/?rev=807&view=rev
Author: inean
Date: 2008-09-11 17:18:32 +0000 (Thu, 11 Sep 2008)
Log Message:
-----------
Fix gcc 4.3 warnings
Modified Paths:
--------------
trunk/ebdl/acinclude.m4
trunk/ebdl/ebdl/ds-factory-backend.c
trunk/ebdl/ebdl/e-app.c
trunk/ebdl/ebdl/e-conf.c
trunk/ebdl/ebdl/e-data-factory.c
trunk/ebdl/ebdl/e-debug.h
trunk/ebdl/ebdl/e-elf.c
trunk/ebdl/ebdl/e-part-factory.c
trunk/ebdl/ebdl/e-pickler-backend-xml.c
trunk/ebdl/ebdl/e-progress-bar.c
trunk/ebdl/ebdl/e-scanner-shell.c
trunk/ebdl/ebdl/e-source.h
trunk/ebdl/ebdl/e-stream-terminal.c
trunk/ebdl/ebdl/e-table-view-console.c
trunk/ebdl/ebdl/e-url.c
trunk/ebdl/ebdl/ed-app.c
trunk/ebdl/ebdl/lk-data-kernel.c
trunk/ebdl/ebdl/lk-kernel.c
trunk/ebdl/ebdl/lk-module.c
trunk/ebdl/ebdl/lk-table-view26.c
trunk/ebdl/ebdl/lkfss-source-extension.c
trunk/ebdl/ebdl-plugin/e-plugins-manager.c
trunk/ebdl/packing/rpm/fedora/ebdl.spec.in.in
trunk/ebdl/tests/Linux/modutils/e-modinfo.c
trunk/ebdl/tests/Linux/modutils/e-modprobe.c
trunk/ebdl/tests/tc-kernel.c
trunk/ebdl/tests/ts-ebdl.c
trunk/ebdl/tests/ts-plugin.c
Modified: trunk/ebdl/acinclude.m4
===================================================================
--- trunk/ebdl/acinclude.m4 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/acinclude.m4 2008-09-11 17:18:32 UTC (rev 807)
@@ -217,7 +217,7 @@
AC_DEFUN([AS_ENABLE_LINUX_KERNEL_BACKEND],[
AS_ENABLE_BACKEND([linux-backend],[linux_kernel],$1, LINUX_KERNEL, [
AC_REQUIRE([AC_CANONICAL_TARGET])
- AC_REQUIRE([EBDL_CHECK_ELF_BYTES])
+ AC_REQUIRE([AS_CHECK_ELF_BYTES])
AC_REQUIRE([AS_ENABLE_BACKENDS])], [
default=no
@@ -281,10 +281,10 @@
])
])
-AC_DEFUN([EBDL_CHECK_ELF_BYTES],[
- AC_REQUIRE([EBDL_CHECK_ELF_CLASS])
- AC_REQUIRE([EBDL_CHECK_ELF_ENCODING])
- AC_REQUIRE([EBDL_CHECK_ELF_MODULE_SEPARATOR])
+AC_DEFUN([AS_CHECK_ELF_BYTES],[
+ AC_REQUIRE([AS_CHECK_ELF_CLASS])
+ AC_REQUIRE([AS_CHECK_ELF_ENCODING])
+ AC_REQUIRE([AS_CHECK_ELF_MODULE_SEPARATOR])
AH_VERBATIM([_ELF_BYTES],
[/* Macros required by elf header */
@@ -309,8 +309,6 @@
# define ELFINDEX(val, limit) ((int16_t)val >= 0 ? val : (limit - (EUINT16_MAX -((uint16_t)(val) - 1))))])
])
-
-
#EBDL_ARG_KERNEL_PATH
# let the user over-ride the kernel source path
AC_DEFUN([AS_CONFIGURE_KERNEL],[
@@ -429,7 +427,7 @@
])
-AC_DEFUN([EBDL_CHECK_ELF_CLASS],
+AC_DEFUN([AS_CHECK_ELF_CLASS],
[
AC_MSG_CHECKING([Elf class type])
AC_CACHE_VAL(ELF_CLASS,
@@ -476,7 +474,7 @@
AC_DEFINE_UNQUOTED([ELF_EI_CLASS],$ELF_CLASS,[Memory alignent of ELF EI_CLASS bit])
])
-AC_DEFUN([EBDL_CHECK_ELF_ENCODING],
+AC_DEFUN([AS_CHECK_ELF_ENCODING],
[
AC_MSG_CHECKING([Elf data encoding type])
AC_CACHE_VAL(ELF_DATA,
@@ -522,7 +520,7 @@
AC_DEFINE_UNQUOTED([ELF_EI_DATA],$ELF_DATA,[Memory alignent of ELF EI_CLASS bit])
])
-AC_DEFUN([EBDL_CHECK_ELF_MODULE_SEPARATOR],[
+AC_DEFUN([AS_CHECK_ELF_MODULE_SEPARATOR],[
AC_REQUIRE([AC_CANONICAL_TARGET])
AC_MSG_CHECKING([Elf Kernel module separator])
@@ -623,10 +621,6 @@
LCOV=no
GCOV=no
- #for now, ccache doesn't work well wich coverage stuff
- if test "x$enable_ccache" = "xyes"; then
- enable_coverage=no
- fi
if test "x$enable_tests" != "xyes"; then
enable_coverage=no
fi
@@ -656,15 +650,6 @@
])
dnl as-compiler-flag.m4 0.1.0
-dnl autostars m4 macro for detection of compiler flags
-dnl David Schleef <ds...@sc...>
-dnl $Id$
-
-dnl AS_COMPILER_FLAG(CFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED])
-dnl Tries to compile with the given CFLAGS.
-dnl Runs ACTION-IF-ACCEPTED if the compiler can compile with the flags,
-dnl and ACTION-IF-NOT-ACCEPTED otherwise.
-
AC_DEFUN([AS_COMPILER_FLAG],
[
AC_MSG_CHECKING([to see if compiler understands $1])
@@ -692,7 +677,7 @@
as_check_error=none
as_check_error=`$PKG_CONFIG --errors-to-stdout --print-errors "$1"`
- dnl AC_MSG_CHECKING([$1])s
+ dnl AC_MSG_CHECKING([$1])
PKG_CHECK_EXISTS([$1],[], AC_MSG_ERROR(dnl
[Package requirements ($1) were not met:
@@ -763,4 +748,3 @@
AS_EXPAND(DATADIR,[${prefix}/share])
AC_DEFINE_UNQUOTED([DATADIR],"$DATADIR", ebdl data dir)
])
-
Modified: trunk/ebdl/ebdl/ds-factory-backend.c
===================================================================
--- trunk/ebdl/ebdl/ds-factory-backend.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/ds-factory-backend.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -134,7 +134,7 @@
/* FIXME: We shoult try to open firstly SYSTEM bus and if failed, open session.
We also seet apporpiately filters */
if (! (connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error))) {
- e_debug (E_DEBUG_LEVEL_CRITICAL, "could not open connection: %s\n", error->message);
+ e_log_warning ("could not open connection: %s\n", error->message);
return NULL;
}
instance = G_OBJECT_CLASS (ds_factory_connection_parent_class)->constructor (type, n_props, props);
Modified: trunk/ebdl/ebdl/e-app.c
===================================================================
--- trunk/ebdl/ebdl/e-app.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/e-app.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -923,9 +923,7 @@
(void *(*)()) e_app_do_threaded_run,
app) != 0) {
- e_debug (E_DEBUG_LEVEL_CRITICAL,
- "Unable to create glib running thread");
-
+ e_log_warning ("Unable to create glib running thread");
pthread_mutex_unlock (&priv->thread_running_lock);
return FALSE;
};
@@ -1024,7 +1022,7 @@
pthread_mutex_lock (&priv->run_lock);
if (e_app_has_child (app)) {
- e_debug (E_DEBUG_LEVEL_CRITICAL,"There is a children app running now!");
+ e_log_warning ("There is a children app running now!");
pthread_mutex_unlock (&priv->run_lock);
/* return child state which should be TRUE, except if
@@ -1037,8 +1035,7 @@
! e_app_is_parent (app)) {
g_assert (priv->forked);
- e_debug (E_DEBUG_LEVEL_CRITICAL,"Forked isn't allowed "
- "for child app objects");
+ e_log_warning ("Forked isn't allowed for child app objects");
pthread_mutex_unlock (&priv->run_lock);
return FALSE;
}
@@ -1110,7 +1107,7 @@
if (s_errno != EAGAIN) {
gchar *str_error = strerror (s_errno);
- e_debug (E_DEBUG_LEVEL_CRITICAL, "%s", str_error);
+ e_log_warning ("%s", str_error);
}
else { /* EAGAIN */
e_debug (E_DEBUG_LEVEL_DEBUG,
Modified: trunk/ebdl/ebdl/e-conf.c
===================================================================
--- trunk/ebdl/ebdl/e-conf.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/e-conf.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -123,9 +123,8 @@
if ((! g_file_test (file, G_FILE_TEST_IS_REGULAR)) &&
(! access (file, R_OK | W_OK))) {
- e_debug (E_DEBUG_LEVEL_CRITICAL,"Insuficient "
- "privileges to access %s configuration file.",file);
-
+ e_log_warning ("Insuficient privileges to "
+ "access %s configuration file.", file);
return NULL;
}
Modified: trunk/ebdl/ebdl/e-data-factory.c
===================================================================
--- trunk/ebdl/ebdl/e-data-factory.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/e-data-factory.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -184,8 +184,6 @@
_CREATE_INSTANCE (source, SOURCE);
_CREATE_INSTANCE (extension, EXTENSION);
- e_debug (E_DEBUG_LEVEL_CRITICAL, "Unsupported Data "
- "type, '%s'", g_type_name (type));
-
+ e_log_warning ("Unsupported Data type, '%s'", g_type_name (type));
return NULL;
}
Modified: trunk/ebdl/ebdl/e-debug.h
===================================================================
--- trunk/ebdl/ebdl/e-debug.h 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/e-debug.h 2008-09-11 17:18:32 UTC (rev 807)
@@ -622,7 +622,6 @@
#define E_DEBUG_LEVEL_ERROR E_DEBUG_LOG_LEVEL_ERROR
#define E_DEBUG_LEVEL_WARNING E_DEBUG_LOG_LEVEL_WARNING
#define E_DEBUG_LEVEL_DEBUG E_DEBUG_LOG_LEVEL_DEBUG
-#define E_DEBUG_LEVEL_CRITICAL E_DEBUG_LOG_LEVEL_WARNING
#endif
@@ -731,14 +730,13 @@
*
* Since: 1.0
*/
-#define e_log_world_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_WORLD, object, ##format);
-#define e_log_error_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_ERROR, object, ##format);
-#define e_log_critical_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_CRITICAL, object, ##format);
-#define e_log_warning_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_WARNING, object, ##format);
-#define e_log_usage_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_USAGE, object, ##format);
-#define e_log_event_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_EVENT, object, ##format);
-#define e_log_debug_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_DEBUG, object, ##format);
-#define e_log_log_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_LOG, object, ##format);
+#define e_log_world_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_WORLD, object, ##format);
+#define e_log_error_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_ERROR, object, ##format);
+#define e_log_warning_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_WARNING, object, ##format);
+#define e_log_usage_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_USAGE, object, ##format);
+#define e_log_event_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_EVENT, object, ##format);
+#define e_log_debug_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_DEBUG, object, ##format);
+#define e_log_log_cat_object(cat, object, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_LOG, object, ##format);
/**
* e_log_world_object:
@@ -803,14 +801,13 @@
*
* Since: 1.0
*/
-#define e_log_world_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_WORLD, object, ##format);
-#define e_log_error_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_ERROR, object, ##format);
-#define e_log_critical_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_CRITICAL, object, ##format);
-#define e_log_warning_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_WARNING, object, ##format);
-#define e_log_usage_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_USAGE, object, ##format);
-#define e_log_event_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_EVENT, object, ##format);
-#define e_log_debug_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_DEBUG, object, ##format);
-#define e_log_log_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_LOG, object, ##format);
+#define e_log_world_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_WORLD, object, ##format);
+#define e_log_error_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_ERROR, object, ##format);
+#define e_log_warning_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_WARNING, object, ##format);
+#define e_log_usage_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_USAGE, object, ##format);
+#define e_log_event_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_EVENT, object, ##format);
+#define e_log_debug_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_DEBUG, object, ##format);
+#define e_log_log_object(object, format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_LOG, object, ##format);
/**
* e_log_world_cat:
@@ -875,14 +872,13 @@
*
* Since: 1.0
*/
-#define e_log_world_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_WORLD, NULL, ##format);
-#define e_log_error_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_ERROR, NULL, ##format);
-#define e_log_critical_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_CRITICAL, NULL, ##format);
-#define e_log_warning_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_WARNING, NULL, ##format);
-#define e_log_usage_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_USAGE, NULL, ##format);
-#define e_log_event_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_EVENT, NULL, ##format);
-#define e_log_debug_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_DEBUG, NULL, ##format);
-#define e_log_log_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_LOG, NULL, ##format);
+#define e_log_world_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_WORLD, NULL, ##format);
+#define e_log_error_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_ERROR, NULL, ##format);
+#define e_log_warning_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_WARNING, NULL, ##format);
+#define e_log_usage_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_USAGE, NULL, ##format);
+#define e_log_event_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_EVENT, NULL, ##format);
+#define e_log_debug_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_DEBUG, NULL, ##format);
+#define e_log_log_cat(cat, format...) E_DEBUG_LOG_FULL (cat, E_DEBUG_LOG_LEVEL_LOG, NULL, ##format);
/**
* e_log_world:
@@ -940,16 +936,14 @@
*
* Since: 1.0
*/
-#define e_log_world(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_WORLD, NULL, ##format);
-#define e_log_error(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_ERROR, NULL, ##format);
-#define e_log_critical(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_CRITICAL, NULL, ##format);
-#define e_log_warning(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_WARNING, NULL, ##format);
-#define e_log_usage(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_USAGE, NULL, ##format);
-#define e_log_event(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_EVENT, NULL, ##format);
-#define e_log_debug(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_DEBUG, NULL, ##format);
-#define e_log_log(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_LOG, NULL, ##format);
+#define e_log_world(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_WORLD, NULL, ##format);
+#define e_log_error(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_ERROR, NULL, ##format);
+#define e_log_warning(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_WARNING, NULL, ##format);
+#define e_log_usage(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_USAGE, NULL, ##format);
+#define e_log_event(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_EVENT, NULL, ##format);
+#define e_log_debug(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_DEBUG, NULL, ##format);
+#define e_log_log(format...) E_DEBUG_LOG_FULL (EBDL_CAT_DEFAULT, E_DEBUG_LOG_LEVEL_LOG, NULL, ##format);
-
G_END_DECLS
#endif /* ! _E_DEBUG_LOG_H_ */
Modified: trunk/ebdl/ebdl/e-elf.c
===================================================================
--- trunk/ebdl/ebdl/e-elf.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/e-elf.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -683,10 +683,10 @@
/* log error */
if (G_UNLIKELY (error != NULL)) {
- e_debug (E_DEBUG_LEVEL_CRITICAL,
- "Unable to allocate resources for %p. "
- "Error message %s", dispose, error->message);
-
+ e_log_warning (
+ "Unable to allocate resources for %p. "
+ "Error message %s", dispose, error->message);
+
g_clear_error (&error);
return;
}
@@ -708,9 +708,9 @@
e_elf_close ((EElf *)dispose, &error);
/* log error */
if (G_UNLIKELY (error != NULL)) {
- e_debug (E_DEBUG_LEVEL_CRITICAL,
- "Unable to dispose resources for %p. "
- "Error message %s", dispose, error->message);
+ e_log_warning (
+ "Unable to dispose resources for %p. "
+ "Error message %s", dispose, error->message);
g_clear_error (&error);
return TRUE;
@@ -2658,7 +2658,7 @@
if (tmp_err) {
g_propagate_error (error, tmp_err);
- g_print (tmp_err->message);
+ g_print ("%s", tmp_err->message);
g_assert_not_reached ();
}
else {
Modified: trunk/ebdl/ebdl/e-part-factory.c
===================================================================
--- trunk/ebdl/ebdl/e-part-factory.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/e-part-factory.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -165,7 +165,7 @@
_CREATE_INSTANCE (kernel, KERNEL);
_CREATE_INSTANCE (extension, EXTENSION);
- e_debug (E_DEBUG_LEVEL_CRITICAL, "Unsupported Part "
+ e_log_warning ("Unsupported Part "
"type, '%s'", g_type_name (type));
return NULL;
Modified: trunk/ebdl/ebdl/e-pickler-backend-xml.c
===================================================================
--- trunk/ebdl/ebdl/e-pickler-backend-xml.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/e-pickler-backend-xml.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -249,7 +249,7 @@
/* print error */
if ((cr = strrchr(str, '\n'))) cr[0] = '\0';
- e_debug (E_DEBUG_LEVEL_CRITICAL, str);
+ e_log_warning ("%s", str);
g_free (str);
}
@@ -265,7 +265,7 @@
/* print error */
if ((cr = strrchr(str, '\n'))) cr[0] = '\0';
- e_debug (E_DEBUG_LEVEL_WARNING, str);
+ e_log_warning ("%s", str);
g_free (str);
}
Modified: trunk/ebdl/ebdl/e-progress-bar.c
===================================================================
--- trunk/ebdl/ebdl/e-progress-bar.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/e-progress-bar.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -860,7 +860,7 @@
/* create_image */
e_stream_printf (bar->stream, "\r");
- e_stream_printf (bar->stream, bar->buffer);
+ e_stream_printf (bar->stream, "%s", bar->buffer);
/* dump '\n' if it' seems like the last element */
if (G_UNLIKELY (bar->total == bar->amount)) {
Modified: trunk/ebdl/ebdl/e-scanner-shell.c
===================================================================
--- trunk/ebdl/ebdl/e-scanner-shell.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/e-scanner-shell.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -279,7 +279,7 @@
#define _IMPL_CASE(_X, _x) \
case E_SCANNER_SHELL_INFO_##_X: \
- g_snprintf (buffer, len, priv->shell->_x); \
+ g_snprintf (buffer, len, "%s", priv->shell->_x); \
return buffer; \
break; \
/**
@@ -313,7 +313,7 @@
case E_SCANNER_SHELL_INFO_COMMAND_LINE:
if ((s = g_find_program_in_path (priv->shell->executable))) {
- g_snprintf (buffer, len, s);
+ g_snprintf (buffer, len, "%s", s);
g_free (s);
}
return buffer;
Modified: trunk/ebdl/ebdl/e-source.h
===================================================================
--- trunk/ebdl/ebdl/e-source.h 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/e-source.h 2008-09-11 17:18:32 UTC (rev 807)
@@ -123,13 +123,13 @@
#define E_SOURCE_ERROR e_source_error_quark ()
-#define E_SOURCE_ADD_DEFAULTS(_s, _t, _e) G_STMT_START { \
- gchar **_u = NULL; \
- e_source_get_uriv (_s, _t##_DEFAULT, &_u, _e); \
- if (_u && _u[0] != NULL && ((!_e) || (! (*(GError **)_e)))) { \
- e_source_set_uriv (_s, _t, (const gchar **)_u, _e); \
- } \
- g_strfreev (_u); \
+#define E_SOURCE_ADD_DEFAULTS(_s, _t, _e) G_STMT_START { \
+ gchar **_u = NULL; \
+ e_source_get_uriv (_s, _t##_DEFAULT, &_u, _e); \
+ if (_u && _u[0] != NULL && ((_e == NULL) || (! (*(GError **)_e)))) { \
+ e_source_set_uriv (_s, _t, (const gchar **)_u, _e); \
+ } \
+ g_strfreev (_u); \
}G_STMT_END
G_END_DECLS
Modified: trunk/ebdl/ebdl/e-stream-terminal.c
===================================================================
--- trunk/ebdl/ebdl/e-stream-terminal.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/e-stream-terminal.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -74,7 +74,7 @@
#if 1/* CONFIG_FEATURE_AUTOWIDTH */
if (ioctl(((EStreamFs *)terminal)->fd, TIOCGWINSZ, &win) != 0) {
- g_print (strerror (errno));
+ g_print ("%s", strerror (errno));
win.ws_row = 24;
win.ws_col = 80;
}
Modified: trunk/ebdl/ebdl/e-table-view-console.c
===================================================================
--- trunk/ebdl/ebdl/e-table-view-console.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/e-table-view-console.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -102,8 +102,9 @@
static gchar
e_stream_keypress()
{
+ gint ret;
+ gchar _foo = '\0';
struct termio savetty, settty;
- gchar _foo = '\0';
ioctl(STDIN_FILENO, TCGETA, &savetty);
ioctl(STDIN_FILENO, TCGETA, &settty);
@@ -112,7 +113,7 @@
ioctl(STDIN_FILENO, TCSETAF, &settty);
/* reak key; */
- read (STDIN_FILENO, &_foo, 1);
+ ret = read (STDIN_FILENO, &_foo, 1);
ioctl(STDIN_FILENO, TCSETAF, &savetty);
return _foo;
}
Modified: trunk/ebdl/ebdl/e-url.c
===================================================================
--- trunk/ebdl/ebdl/e-url.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/e-url.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -37,6 +37,8 @@
#include <stdlib.h>
#include <errno.h>
#include <string.h>
+#include <limits.h>
+#include <stdlib.h>
/* native headers */
#include <netdb.h>
@@ -367,7 +369,7 @@
last = strrchr (base->path, '/');
if (last) {
newpath = g_strdup_printf ("%.*s/%s",
- last - base->path,
+ (gint)(last - base->path),
base->path,
url->path);
} else
Modified: trunk/ebdl/ebdl/ed-app.c
===================================================================
--- trunk/ebdl/ebdl/ed-app.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/ed-app.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -634,7 +634,7 @@
return TRUE;
if (G_UNLIKELY (! priv->kernel)) {
- e_debug (E_DEBUG_LEVEL_CRITICAL, "Unable to create a valid handler for active kernel.");
+ e_log_warning ("Unable to create a valid handler for active kernel.");
return FALSE;
}
@@ -647,7 +647,7 @@
E_PART_SET_MODE_REFERENCE, &error);
if (e_monitor_start ((EMonitor *) priv->kernel, &error) < 0) {
- e_debug (E_DEBUG_LEVEL_CRITICAL, "Unable to open monitor for "
+ e_log_warning ("Unable to open monitor for "
"active kernel. '%s'.", error->message);
g_object_unref (priv->kernel);
@@ -661,7 +661,7 @@
return TRUE;
}
- e_debug (E_DEBUG_LEVEL_CRITICAL, "Unable to create a valid handler for active kernel.");
+ e_log_warning ("Unable to create a valid handler for active kernel.");
return FALSE;
}
@@ -713,7 +713,7 @@
if (priv->connection == NULL) {
if (! (priv->connection = dbus_g_bus_get (type, error))) {
if (error != NULL) {
- e_debug (E_DEBUG_LEVEL_CRITICAL, "Error '%d'. Could not get "
+ e_log_warning ("Error '%d'. Could not get "
"the system bus.'%s'", (*error)->code, (*error)->message);
}
return E_ERROR;
@@ -729,11 +729,11 @@
g_object_unref (bus_proxy);
if (adquisition == DBUS_REQUEST_NAME_REPLY_EXISTS) {
- e_debug (E_DEBUG_LEVEL_CRITICAL, "A previous instance is running");
+ e_log_warning ("A previous instance is running");
return E_ERROR;
}
if (! ret || *error) {
- e_debug (E_DEBUG_LEVEL_CRITICAL, "Error %d. Could not acquire service. '%s'", (*error)->code, (*error)->message);
+ e_log_warning ("Error %d. Could not acquire service. '%s'", (*error)->code, (*error)->message);
return E_ERROR;
}
Modified: trunk/ebdl/ebdl/lk-data-kernel.c
===================================================================
--- trunk/ebdl/ebdl/lk-data-kernel.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/lk-data-kernel.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -170,7 +170,7 @@
}
else {
memset (&u, '\0', sizeof (struct utsname));
- g_snprintf (version, sizeof (version), u.version);
+ g_snprintf (version, sizeof (version), "%s", u.version);
}
return_value = g_new0 (GValue, 1);
Modified: trunk/ebdl/ebdl/lk-kernel.c
===================================================================
--- trunk/ebdl/ebdl/lk-kernel.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/lk-kernel.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -91,7 +91,7 @@
version = e_data_client_peek_string (data, E_DATA_KERNEL_VERSION, NULL);
g_assert (version);
- g_snprintf (buffer, sizeof (buffer), version);
+ g_snprintf (buffer, sizeof (buffer), "%s", version);
g_object_unref (data);
return (strcmp (buffer, u.release) == 0);
Modified: trunk/ebdl/ebdl/lk-module.c
===================================================================
--- trunk/ebdl/ebdl/lk-module.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/lk-module.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -193,7 +193,7 @@
url_string = e_handler_peek_url_string ((EHandler *)module);
if (G_LIKELY (url_string)) {
modname = strrchr (url_string, G_DIR_SEPARATOR);
- modname = g_strdup_printf (modname ? modname + 1 : url_string);
+ modname = g_strdup_printf ("%s", modname ? modname + 1 : url_string);
g_strdelimit (modname, ".;", '\0');
normalize (modname);
}
Modified: trunk/ebdl/ebdl/lk-table-view26.c
===================================================================
--- trunk/ebdl/ebdl/lk-table-view26.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/lk-table-view26.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -257,8 +257,8 @@
G_DEFINE_TYPE_WITH_CODE (LkTableUSBStream, lk_table_usb_stream, E_TYPE_TABLE_VIEW_STREAM,
G_IMPLEMENT_INTERFACE (E_TYPE_TABLE_VIEW , NULL));
-#if ELF_EI_CLASS == ELFCLASS64
-# define INPUT_FORMAT_STRING "0x%llx"
+#if ELF_EI_CLASS == 2
+# define INPUT_FORMAT_STRING "0x%lux"
# define INPUT_FORMAT_ARRAY "%lx"
#else
# define INPUT_FORMAT_STRING "0x%x"
Modified: trunk/ebdl/ebdl/lkfss-source-extension.c
===================================================================
--- trunk/ebdl/ebdl/lkfss-source-extension.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl/lkfss-source-extension.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -146,7 +146,7 @@
/* check if well formed */
if (strstr (uri, "://")) {
- g_snprintf (buffer, len, uri);
+ g_snprintf (buffer, len, "%s", uri);
return;
}
/* return well formed path */
@@ -367,7 +367,7 @@
g_assert (regex);
/* get dirname path */
- g_snprintf (candidate, PATH_MAX, paths[i]);
+ g_snprintf (candidate, PATH_MAX, "%s", paths[i]);
len = strcspn (candidate, "{*!?+[(");
if (len < strlen (candidate)) {
Modified: trunk/ebdl/ebdl-plugin/e-plugins-manager.c
===================================================================
--- trunk/ebdl/ebdl-plugin/e-plugins-manager.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/ebdl-plugin/e-plugins-manager.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -569,7 +569,7 @@
e_plugins_manager_constructor (GType type, guint n_props,
GObjectConstructParam *props)
{
- gint i, fd;
+ gint i, fd, ret;
gchar buffer[1024];
gchar **dirs = NULL;
EPluginsManagerPrivate *priv;
@@ -607,7 +607,7 @@
priv->session_id = g_strdup_printf (EBDL_SESSION_CONF_FILE, g_get_user_config_dir ());
if (G_UNLIKELY (! g_file_test (priv->session_id, G_FILE_TEST_IS_REGULAR))) {
if ((fd = creat (priv->session_id, S_IRUSR | S_IWUSR))) {
- write (fd, TEMPLATE_FILE, strlen (TEMPLATE_FILE));
+ ret = write (fd, TEMPLATE_FILE, strlen (TEMPLATE_FILE));
close (fd);
}
}
Modified: trunk/ebdl/packing/rpm/fedora/ebdl.spec.in.in
===================================================================
--- trunk/ebdl/packing/rpm/fedora/ebdl.spec.in.in 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/packing/rpm/fedora/ebdl.spec.in.in 2008-09-11 17:18:32 UTC (rev 807)
@@ -16,7 +16,7 @@
Version: %{ver}
License: LGPL
URL: http://gmodulo.sourceforge.net/ebdl/
-Release: 1%{?dist}
+Release: 2%{?dist}
Source: %{nam}-%{ver}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{ver}-root
Docdir: %{_prefix}/share/doc
Modified: trunk/ebdl/tests/Linux/modutils/e-modinfo.c
===================================================================
--- trunk/ebdl/tests/Linux/modutils/e-modinfo.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/tests/Linux/modutils/e-modinfo.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -204,7 +204,7 @@
}
/* add module paths */
- E_SOURCE_ADD_DEFAULTS (source, E_SOURCE_URI_TYPE_LOCATION, &error);
+
g_assert (error == NULL);
/* add configuration files */
Modified: trunk/ebdl/tests/Linux/modutils/e-modprobe.c
===================================================================
--- trunk/ebdl/tests/Linux/modutils/e-modprobe.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/tests/Linux/modutils/e-modprobe.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -29,8 +29,11 @@
static void
add_to_env_var (const char *option)
{
- char *env = getenv("MODPROBE_OPTIONS");
- asprintf(&env, "%s %s", env != NULL ? env : "", option);
+ gint ret;
+ char *env;
+
+ env = getenv("MODPROBE_OPTIONS");
+ ret = asprintf(&env, "%s %s", env != NULL ? env : "", option);
setenv("MODPROBE_OPTIONS", env, 1);
}
Modified: trunk/ebdl/tests/tc-kernel.c
===================================================================
--- trunk/ebdl/tests/tc-kernel.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/tests/tc-kernel.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -52,7 +52,7 @@
g_strdelimit (path, "\n", '\0');
- uri = e_uri_new_printf (path);
+ uri = e_uri_new_printf ("%s", path);
g_free (path);
kernel = e_part_factory_create_kernel (factory, (EHandler *)uri, NULL);
Modified: trunk/ebdl/tests/ts-ebdl.c
===================================================================
--- trunk/ebdl/tests/ts-ebdl.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/tests/ts-ebdl.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -79,7 +79,7 @@
/* parse */
if (G_UNLIKELY (! g_option_context_parse (context, argc, argv, &error))) {
- g_printerr (error->message);
+ g_printerr ("%s", error->message);
g_error_free (error);
return FALSE;
}
Modified: trunk/ebdl/tests/ts-plugin.c
===================================================================
--- trunk/ebdl/tests/ts-plugin.c 2008-09-11 17:12:30 UTC (rev 806)
+++ trunk/ebdl/tests/ts-plugin.c 2008-09-11 17:18:32 UTC (rev 807)
@@ -97,7 +97,7 @@
/* parse */
if (G_UNLIKELY (! g_option_context_parse (context, argc, argv, &error))) {
- g_printerr (error->message);
+ g_printerr ("%s", error->message);
g_error_free (error);
return FALSE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|