diff options
Diffstat (limited to 'gconf')
-rw-r--r-- | gconf/gconf-preproc.c | 5 | ||||
-rw-r--r-- | gconf/gconf.h | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/gconf/gconf-preproc.c b/gconf/gconf-preproc.c index af26d1a..eb50474 100644 --- a/gconf/gconf-preproc.c +++ b/gconf/gconf-preproc.c @@ -258,7 +258,7 @@ pp_list_find (gl_list_t list, struct file_data *dptr) const void *p; gl_list_iterator_t itr = gl_list_iterator (list); - while (gl_list_iterator_next (&itr, &p, NULL)) + while (!dptr->found && gl_list_iterator_next (&itr, &p, NULL)) { const char *dir = p; size_t size = strlen (dir) + 1 + dptr->namelen + 1; @@ -270,8 +270,7 @@ pp_list_find (gl_list_t list, struct file_data *dptr) strcpy (dptr->buf, dir); strcat (dptr->buf, "/"); strcat (dptr->buf, dptr->name); - if (dptr->found = (access (dptr->buf, F_OK) == 0)) - break; + dptr->found = access (dptr->buf, F_OK) == 0; } gl_list_iterator_free (&itr); return dptr->found; diff --git a/gconf/gconf.h b/gconf/gconf.h index 8c04b6d..f88e87a 100644 --- a/gconf/gconf.h +++ b/gconf/gconf.h @@ -101,8 +101,10 @@ gconf_value_t *gconf_value_dup(gconf_value_t *input); extern void gconf_print_diag(gconf_locus_t *, int, int, const char*); -void gconf_warning(gconf_locus_t *locus, int errcode, const char *fmt, ...); -void gconf_error(gconf_locus_t *locus, int errcode, const char *fmt, ...); +void gconf_warning(gconf_locus_t *locus, int errcode, const char *fmt, ...) + __attribute__ ((__format__ (__printf__, 3, 4))); +void gconf_error(gconf_locus_t *locus, int errcode, const char *fmt, ...) + __attribute__ ((__format__ (__printf__, 3, 4))); void gconf_set_keywords(struct gconf_keyword *kwd); void gconf_gram_trace(int n); void gconf_lex_trace (int n); |