diff options
| author | Sergey Udaltsov <svu@gnome.org> | 2008-04-27 14:59:54 +0000 |
|---|---|---|
| committer | Sergey Udaltsov <svu@gnome.org> | 2008-04-27 14:59:54 +0000 |
| commit | 173ccdf98fad0e03e5c1547250b5f3072e8a5a11 (patch) | |
| tree | f028ec0f6e836b93c25d7170e89810ffa07b0a04 | |
| parent | b487089a167da382224b5f1d263119f52ea02dc6 (diff) | |
| download | libxklavier-173ccdf98fad0e03e5c1547250b5f3072e8a5a11.tar.gz | |
C99 fixes - s/snprintf/g_snprintf/
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | libxklavier/xklavier_config.c | 5 | ||||
| -rw-r--r-- | libxklavier/xklavier_config_xkb.c | 2 | ||||
| -rw-r--r-- | libxklavier/xklavier_util.c | 2 | ||||
| -rwxr-xr-x | libxklavier/xklavier_xmm.c | 4 |
5 files changed, 10 insertions, 7 deletions
@@ -3,7 +3,9 @@ * libxklavier/xkl_config_item.h, libxklavier/xkl_config_registry.h, doc/reference: a bit of cleanup for gtkdoc * NEWS: preparing 3.6 - * libxklavier/xklavier_config_iso.c: C99 fix + * libxklavier/xklavier_config_iso.c, libxklavier/xklavier_config.c, + libxklavier/xklavier_config_xkb.c, libxklavier/xklavier_util.c, + libxklavier/xklavier_xmm.c: C99 fixes 2008-04-26 svu diff --git a/libxklavier/xklavier_config.c b/libxklavier/xklavier_config.c index 52518a0..3438eac 100644 --- a/libxklavier/xklavier_config.c +++ b/libxklavier/xklavier_config.c @@ -272,7 +272,7 @@ xkl_config_registry_foreach_in_xpath_with_param(XklConfigRegistry if (!xkl_config_registry_is_initialized(config)) return; - snprintf(xpath_expr, sizeof xpath_expr, format, value); + g_snprintf(xpath_expr, sizeof xpath_expr, format, value); xpath_obj = xmlXPathEval((unsigned char *) xpath_expr, xkl_config_registry_priv(config, xpath_context)); @@ -300,7 +300,8 @@ xkl_config_registry_find_object(XklConfigRegistry * config, if (!xkl_config_registry_is_initialized(config)) return FALSE; - snprintf(xpath_expr, sizeof xpath_expr, format, arg1, pitem->name); + g_snprintf(xpath_expr, sizeof xpath_expr, format, arg1, + pitem->name); xpath_obj = xmlXPathEval((unsigned char *) xpath_expr, xkl_config_registry_priv(config, xpath_context)); diff --git a/libxklavier/xklavier_config_xkb.c b/libxklavier/xklavier_config_xkb.c index b97984e..c5f18a3 100644 --- a/libxklavier/xklavier_config_xkb.c +++ b/libxklavier/xklavier_config_xkb.c @@ -65,7 +65,7 @@ xkl_rules_set_load(XklEngine * engine) locale = setlocale(LC_ALL, NULL); - snprintf(file_name, sizeof file_name, XKB_BASE "/rules/%s", rf); + g_snprintf(file_name, sizeof file_name, XKB_BASE "/rules/%s", rf); xkl_debug(160, "Loading rules from [%s]\n", file_name); rules_set = XkbRF_Load(file_name, locale, True, True); diff --git a/libxklavier/xklavier_util.c b/libxklavier/xklavier_util.c index 47d860b..913afb8 100644 --- a/libxklavier/xklavier_util.c +++ b/libxklavier/xklavier_util.c @@ -121,7 +121,7 @@ xkl_get_debug_window_title(XklEngine * engine, Window win) if (win != (Window) NULL) { name = xkl_engine_get_window_title(engine, win); if (name != NULL) { - snprintf(sname, sizeof(sname), "%.32s", name); + g_snprintf(sname, sizeof(sname), "%.32s", name); g_free(name); } } diff --git a/libxklavier/xklavier_xmm.c b/libxklavier/xklavier_xmm.c index 64697ce..a44a9bd 100755 --- a/libxklavier/xklavier_xmm.c +++ b/libxklavier/xklavier_xmm.c @@ -263,8 +263,8 @@ xkl_xmm_actualize_group(XklEngine * engine, gint group) xkl_engine_backend(engine, XklXmm, current_config).layouts[group]; - snprintf(cmd, sizeof cmd, - "xmodmap %s/xmodmap.%s", XMODMAP_BASE, layout_name); + g_snprintf(cmd, sizeof cmd, + "xmodmap %s/xmodmap.%s", XMODMAP_BASE, layout_name); res = system(cmd); if (res > 0) { |