diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-04-02 00:38:18 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-04-02 00:38:18 +0300 |
| commit | f731d398434e4d85a7aa0af7c299160f49e92fc9 (patch) | |
| tree | cab66782ca21ada8879df091b4ba80fb320babca | |
| parent | 94833cc27ffdb8804ec8916e3fc302da7282ec0f (diff) | |
| download | idest-f731d398434e4d85a7aa0af7c299160f49e92fc9.tar.gz idest-f731d398434e4d85a7aa0af7c299160f49e92fc9.tar.bz2 | |
Update for recent Gnulib.
* src/idest.h: Include gl_xlist.h.
(set_frame_value): New proto.
* src/idop.c (add_stringlist, add_field, frame_to_list): Static.
* src/slist.c: Shut up gcc warnings.
* gnulib.modules: Add xlist.
* src/backup.c: Include unistd.h
| -rw-r--r-- | gnulib.modules | 2 | ||||
| -rw-r--r-- | src/backup.c | 1 | ||||
| -rw-r--r-- | src/idest.h | 7 | ||||
| -rw-r--r-- | src/idop.c | 10 | ||||
| -rw-r--r-- | src/slist.c | 2 |
5 files changed, 14 insertions, 8 deletions
diff --git a/gnulib.modules b/gnulib.modules index 4461913..4bb3e43 100644 --- a/gnulib.modules +++ b/gnulib.modules @@ -12,3 +12,5 @@ obstack progname save-cwd xalloc +xlist + diff --git a/src/backup.c b/src/backup.c index 6bc2119..42e9879 100644 --- a/src/backup.c +++ b/src/backup.c @@ -16,6 +16,7 @@ #include "idest.h" #include <sys/stat.h> +#include <unistd.h> #include <fcntl.h> #include "save-cwd.h" #include "dirname.h" diff --git a/src/idest.h b/src/idest.h index 696f046..d9fc852 100644 --- a/src/idest.h +++ b/src/idest.h @@ -24,6 +24,7 @@ #include <progname.h> #include <xalloc.h> #include <gl_linked_list.h> +#include <gl_xlist.h> #include <argmatch.h> #include <backupfile.h> #include <id3tag.h> @@ -69,11 +70,13 @@ extern int guile_debug; extern char *guile_script; extern char *guile_function; +/* idop.c */ +void set_frame_value(struct id3_frame *frame, const char *value); void set_tags(const char *name); -void query_tags(const char *name); void del_tags(const char *name); - char *idest_ucs4_cvt(id3_ucs4_t const *ucs4); +void query_tags(const char *name); +void del_id3v2(const char *name); /* slist.c */ @@ -162,7 +162,7 @@ idest_ucs4_cvt(id3_ucs4_t const *ucs4) return (char*)id3_ucs4_utf8duplicate(ucs4); } -void +static void add_stringlist(gl_list_t list, struct id3_frame *frame, union id3_field *field) { @@ -181,7 +181,7 @@ add_stringlist(gl_list_t list, struct id3_frame *frame, } } -void +static void add_field(gl_list_t list, struct id3_frame *frame, union id3_field *field) { id3_ucs4_t const *ucs4; @@ -216,7 +216,7 @@ add_field(gl_list_t list, struct id3_frame *frame, union id3_field *field) } } -gl_list_t +static gl_list_t frame_to_list(struct id3_frame *frame) { gl_list_t list; @@ -224,7 +224,7 @@ frame_to_list(struct id3_frame *frame) union id3_field *field; list = new_string_list(true); - for (i = 0; field = id3_frame_field(frame, i); i++) + for (i = 0; (field = id3_frame_field(frame, i)); i++) add_field(list, frame, field); return list; } @@ -235,7 +235,7 @@ show_tags(struct id3_tag *tag) struct id3_frame *frame; unsigned i; - for (i = 0; frame = id3_tag_findframe(tag, NULL, i); i++) { + for (i = 0; (frame = id3_tag_findframe(tag, NULL, i)); i++) { gl_list_t list = frame_to_list(frame); if (gl_list_size(list) > 0) ed_list_add_item(frame->id, list); diff --git a/src/slist.c b/src/slist.c index 42bedd3..923def0 100644 --- a/src/slist.c +++ b/src/slist.c @@ -45,7 +45,7 @@ do_string_list(gl_list_t list, string_list_action_fn action, void *data) gl_list_iterator_t itr = gl_list_iterator(list); const void *p; while (gl_list_iterator_next(&itr, &p, NULL)) - if (rc = action((const char*)p, data)) + if ((rc = action((const char*)p, data))) break; gl_list_iterator_free(&itr); return rc; |