chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
sd-id128: handle NULL return parameter in sd_id128_from_string() nicer
[elogind.git]
/
src
/
libelogind
/
sd-id128
/
sd-id128.c
diff --git
a/src/libelogind/sd-id128/sd-id128.c
b/src/libelogind/sd-id128/sd-id128.c
index 1470e4c01a7f9c71d365c115d141f084b6a3fdb0..9f47d04e61b26f1fe61750ae2858e87d4bf93172 100644
(file)
--- a/
src/libelogind/sd-id128/sd-id128.c
+++ b/
src/libelogind/sd-id128/sd-id128.c
@@
-52,7
+52,6
@@
_public_ int sd_id128_from_string(const char s[], sd_id128_t *ret) {
bool is_guid = false;
assert_return(s, -EINVAL);
- assert_return(ret, -EINVAL);
for (n = 0, i = 0; n < 16;) {
int a, b;
@@
-90,7
+89,8
@@
_public_ int sd_id128_from_string(const char s[], sd_id128_t *ret) {
if (s[i] != 0)
return -EINVAL;
- *ret = t;
+ if (ret)
+ *ret = t;
return 0;
}