chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add __attribute__((const, pure, format)) in various places
[elogind.git]
/
src
/
shared
/
calendarspec.c
diff --git
a/src/shared/calendarspec.c
b/src/shared/calendarspec.c
index 3cddb0eed01bccb29d433d3a10f3404ec98e173e..7979e2384f53014e105d173519c60acb9a3ac6a9 100644
(file)
--- a/
src/shared/calendarspec.c
+++ b/
src/shared/calendarspec.c
@@
-133,7
+133,7
@@
int calendar_spec_normalize(CalendarSpec *c) {
return 0;
}
return 0;
}
-static bool chain_valid(CalendarComponent *c, int from, int to) {
+
_pure_
static bool chain_valid(CalendarComponent *c, int from, int to) {
if (!c)
return true;
if (!c)
return true;
@@
-149,7
+149,7
@@
static bool chain_valid(CalendarComponent *c, int from, int to) {
return true;
}
return true;
}
-bool calendar_spec_valid(CalendarSpec *c) {
+
_pure_
bool calendar_spec_valid(CalendarSpec *c) {
assert(c);
if (c->weekdays_bits > 127)
assert(c);
if (c->weekdays_bits > 127)
@@
-391,7
+391,7
@@
static int prepend_component(const char **p, CalendarComponent **c) {
errno = 0;
value = strtoul(*p, &e, 10);
errno = 0;
value = strtoul(*p, &e, 10);
- if (errno
!=
0)
+ if (errno
>
0)
return -errno;
if (e == *p)
return -EINVAL;
return -errno;
if (e == *p)
return -EINVAL;
@@
-400,7
+400,7
@@
static int prepend_component(const char **p, CalendarComponent **c) {
if (*e == '/') {
repeat = strtoul(e+1, &ee, 10);
if (*e == '/') {
repeat = strtoul(e+1, &ee, 10);
- if (errno
!=
0)
+ if (errno
>
0)
return -errno;
if (ee == e+1)
return -EINVAL;
return -errno;
if (ee == e+1)
return -EINVAL;
@@
-653,7
+653,7
@@
int calendar_spec_from_string(const char *p, CalendarSpec **spec) {
if (!c)
return -ENOMEM;
if (!c)
return -ENOMEM;
- if (strcase
cmp(p, "hourly") == 0
) {
+ if (strcase
eq(p, "hourly")
) {
r = const_chain(0, &c->minute);
if (r < 0)
goto fail;
r = const_chain(0, &c->minute);
if (r < 0)
goto fail;
@@
-661,7
+661,7
@@
int calendar_spec_from_string(const char *p, CalendarSpec **spec) {
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- } else if (strcase
cmp(p, "daily") == 0
) {
+ } else if (strcase
eq(p, "daily")
) {
r = const_chain(0, &c->hour);
if (r < 0)
goto fail;
r = const_chain(0, &c->hour);
if (r < 0)
goto fail;
@@
-672,7
+672,7
@@
int calendar_spec_from_string(const char *p, CalendarSpec **spec) {
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- } else if (strcase
cmp(p, "monthly") == 0
) {
+ } else if (strcase
eq(p, "monthly")
) {
r = const_chain(1, &c->day);
if (r < 0)
goto fail;
r = const_chain(1, &c->day);
if (r < 0)
goto fail;
@@
-686,7
+686,7
@@
int calendar_spec_from_string(const char *p, CalendarSpec **spec) {
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- } else if (strcase
cmp(p, "weekly") == 0
) {
+ } else if (strcase
eq(p, "weekly")
) {
c->weekdays_bits = 1;
c->weekdays_bits = 1;
@@
-738,7
+738,7
@@
fail:
static int find_matching_component(const CalendarComponent *c, int *val) {
const CalendarComponent *n;
static int find_matching_component(const CalendarComponent *c, int *val) {
const CalendarComponent *n;
- int d;
+ int d
= -1
;
bool d_set = false;
int r;
bool d_set = false;
int r;