mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00
Code Issues Projects Releases Wiki Activity

* dbusbind.c (Fdbus_register_signal): Use sprintf + strcat instead

Browse source 
only sprintf.
This commit is contained in:
Michael Albinus 2008-07-21 04:28:50 +00:00
parent 383f1f54c9
commit c0894fb9cb
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2008-07-21 Michael Albinus <michael.albinus@gmx.de>
* dbusbind.c (Fdbus_register_signal): Use sprintf + strcat instead
only sprintf.
2008-07-21 Kenichi Handa <handa@m17n.org>
* ftfont.c (adjust_anchor): Check if DetalValue is not NULL.

14
src/dbusbind.c
View file

@ -1314,6 +1314,7 @@ usage: (dbus-register-signal BUS SERVICE PATH INTERFACE SIGNAL HANDLER &rest ARG
DBusConnection *connection;
int i;
char rule[DBUS_MAXIMUM_MATCH_RULE_LENGTH];
char x[DBUS_MAXIMUM_MATCH_RULE_LENGTH];
DBusError derror;
/* Check parameters. */
@ -1366,17 +1367,24 @@ usage: (dbus-register-signal BUS SERVICE PATH INTERFACE SIGNAL HANDLER &rest ARG
/* Add unique name and path to the rule if they are non-nil. */
if (!NILP (uname))
sprintf (rule, "%s,sender='%s'", rule, SDATA (uname));
{
sprintf (x, ",sender='%s'", SDATA (uname));
strcat (rule, x);
}
if (!NILP (path))
sprintf (rule, "%s,path='%s'", rule, SDATA (path));
{
sprintf (x, ",path='%s'", SDATA (path));
strcat (rule, x);
}
/* Add arguments to the rule if they are non-nil. */
for (i = 6; i < nargs; ++i)
if (!NILP (args[i]))
{
CHECK_STRING (args[i]);
sprintf (rule, "%s,arg%d='%s'", rule, i-6, SDATA (args[i]));
sprintf (x, ",arg%d='%s'", i-6, SDATA (args[i]));
strcat (rule, x);
}
/* Add the rule to the bus. */