Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
ecfc0a49
Commit
ecfc0a49
authored
Sep 05, 2011
by
Michael Albinus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* dbusbind.c (xd_signature_cat): Rename from signature_cat.
parent
f62bd846
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
src/ChangeLog
src/ChangeLog
+4
-0
src/dbusbind.c
src/dbusbind.c
+6
-6
No files found.
src/ChangeLog
View file @
ecfc0a49
2011-09-05 Michael Albinus <michael.albinus@gmx.de>
* dbusbind.c (xd_signature_cat): Rename from signature_cat.
2011-09-04 Paul Eggert <eggert@cs.ucla.edu>
sprintf-related integer and memory overflow issues (Bug#9412).
...
...
src/dbusbind.c
View file @
ecfc0a49
...
...
@@ -262,7 +262,7 @@ xd_symbol_to_dbus_type (Lisp_Object object)
/* Append to SIGNATURE a copy of X, making sure SIGNATURE does
not become too long. */
static
void
signature_cat
(
char
*
signature
,
char
const
*
x
)
xd_
signature_cat
(
char
*
signature
,
char
const
*
x
)
{
ptrdiff_t
siglen
=
strlen
(
signature
);
ptrdiff_t
xlen
=
strlen
(
x
);
...
...
@@ -401,10 +401,10 @@ xd_signature (char *signature, unsigned int dtype, unsigned int parent_type, Lis
{
subtype
=
XD_OBJECT_TO_DBUS_TYPE
(
CAR_SAFE
(
elt
));
xd_signature
(
x
,
subtype
,
dtype
,
CAR_SAFE
(
XD_NEXT_VALUE
(
elt
)));
signature_cat
(
signature
,
x
);
xd_
signature_cat
(
signature
,
x
);
elt
=
CDR_SAFE
(
XD_NEXT_VALUE
(
elt
));
}
signature_cat
(
signature
,
DBUS_STRUCT_END_CHAR_AS_STRING
);
xd_
signature_cat
(
signature
,
DBUS_STRUCT_END_CHAR_AS_STRING
);
break
;
case
DBUS_TYPE_DICT_ENTRY
:
...
...
@@ -425,7 +425,7 @@ xd_signature (char *signature, unsigned int dtype, unsigned int parent_type, Lis
elt
=
XD_NEXT_VALUE
(
elt
);
subtype
=
XD_OBJECT_TO_DBUS_TYPE
(
CAR_SAFE
(
elt
));
xd_signature
(
x
,
subtype
,
dtype
,
CAR_SAFE
(
XD_NEXT_VALUE
(
elt
)));
signature_cat
(
signature
,
x
);
xd_
signature_cat
(
signature
,
x
);
if
(
!
XD_BASIC_DBUS_TYPE
(
subtype
))
wrong_type_argument
(
intern
(
"D-Bus"
),
CAR_SAFE
(
XD_NEXT_VALUE
(
elt
)));
...
...
@@ -434,14 +434,14 @@ xd_signature (char *signature, unsigned int dtype, unsigned int parent_type, Lis
elt
=
CDR_SAFE
(
XD_NEXT_VALUE
(
elt
));
subtype
=
XD_OBJECT_TO_DBUS_TYPE
(
CAR_SAFE
(
elt
));
xd_signature
(
x
,
subtype
,
dtype
,
CAR_SAFE
(
XD_NEXT_VALUE
(
elt
)));
signature_cat
(
signature
,
x
);
xd_
signature_cat
(
signature
,
x
);
if
(
!
NILP
(
CDR_SAFE
(
XD_NEXT_VALUE
(
elt
))))
wrong_type_argument
(
intern
(
"D-Bus"
),
CAR_SAFE
(
CDR_SAFE
(
XD_NEXT_VALUE
(
elt
))));
/* Closing signature. */
signature_cat
(
signature
,
DBUS_DICT_ENTRY_END_CHAR_AS_STRING
);
xd_
signature_cat
(
signature
,
DBUS_DICT_ENTRY_END_CHAR_AS_STRING
);
break
;
default:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment