diff --git a/src/lib/cd.c b/src/lib/cd.c index 3abdb4a..41315b3 100644 --- a/src/lib/cd.c +++ b/src/lib/cd.c @@ -41,7 +41,7 @@ struct Cd { Track *track[MAXTRACK]; /* array of tracks */ }; -Cd *cd_init () +Cd *cd_init() { Cd *cd = NULL; cd = malloc(sizeof(Cd)); @@ -58,7 +58,7 @@ Cd *cd_init () return cd; } -Track *track_init () +Track *track_init() { Track *track = NULL; track = malloc(sizeof(Track)); @@ -95,17 +95,17 @@ Track *track_init () /* * cd structure functions */ -void cd_set_mode (Cd *cd, int mode) +void cd_set_mode(Cd *cd, int mode) { cd->mode = mode; } -int cd_get_mode (Cd *cd) +int cd_get_mode(Cd *cd) { return cd->mode; } -void cd_set_catalog (Cd *cd, char *catalog) +void cd_set_catalog(Cd *cd, char *catalog) { if (cd->catalog) { free(cd->catalog); @@ -114,17 +114,17 @@ void cd_set_catalog (Cd *cd, char *catalog) cd->catalog = strdup(catalog); } -char *cd_get_catalog (Cd *cd) +char *cd_get_catalog(Cd *cd) { return cd->catalog; } -Cdtext *cd_get_cdtext (Cd *cd) +Cdtext *cd_get_cdtext(Cd *cd) { return cd->cdtext; } -Track *cd_add_track (Cd *cd) +Track *cd_add_track(Cd *cd) { if (MAXTRACK - 1 > cd->ntrack) { cd->ntrack++; @@ -139,12 +139,12 @@ Track *cd_add_track (Cd *cd) } -int cd_get_ntrack (Cd *cd) +int cd_get_ntrack(Cd *cd) { return cd->ntrack; } -Track *cd_get_track (Cd *cd, int i) +Track *cd_get_track(Cd *cd, int i) { if (0 < i <= cd->ntrack) { return cd->track[i - 1]; @@ -157,7 +157,7 @@ Track *cd_get_track (Cd *cd, int i) * track structure functions */ -void track_set_filename (Track *track, char *filename) +void track_set_filename(Track *track, char *filename) { if (track->file.name) { free(track->file.name); @@ -166,86 +166,86 @@ void track_set_filename (Track *track, char *filename) track->file.name = strdup(filename); } -char *track_get_filename (Track *track) +char *track_get_filename(Track *track) { return track->file.name; } -void track_set_start (Track *track, long start) +void track_set_start(Track *track, long start) { track->file.start = start; } -long track_get_start (Track *track) +long track_get_start(Track *track) { return track->file.start; } -void track_set_length (Track *track, long length) +void track_set_length(Track *track, long length) { track->file.length = length; } -long track_get_length (Track *track) +long track_get_length(Track *track) { return track->file.length; } -void track_set_mode (Track *track, int mode) +void track_set_mode(Track *track, int mode) { track->mode = mode; } -int track_get_mode (Track *track) +int track_get_mode(Track *track) { return track->mode; } -void track_set_sub_mode (Track *track, int sub_mode) +void track_set_sub_mode(Track *track, int sub_mode) { track->sub_mode = sub_mode; } -int track_get_sub_mode (Track *track) +int track_get_sub_mode(Track *track) { return track->sub_mode; } -void track_set_flag (Track *track, int flag) +void track_set_flag(Track *track, int flag) { track->flags |= flag; } -void track_clear_flag (Track *track, int flag) +void track_clear_flag(Track *track, int flag) { track->flags &= ~flag; } -int track_is_set_flag (Track *track, int flag) +int track_is_set_flag(Track *track, int flag) { return track->flags & flag; } -void track_set_zero_pre (Track *track, long length) +void track_set_zero_pre(Track *track, long length) { track->zero_pre.length = length; } -long track_get_zero_pre (Track *track) +long track_get_zero_pre(Track *track) { return track->zero_pre.length; } -void track_set_zero_post (Track *track, long length) +void track_set_zero_post(Track *track, long length) { track->zero_post.length = length; } -long track_get_zero_post (Track *track) +long track_get_zero_post(Track *track) { return track->zero_post.length; } -void track_set_isrc (Track *track, char *isrc) +void track_set_isrc(Track *track, char *isrc) { if (track->isrc) { free(track->isrc); @@ -254,17 +254,17 @@ void track_set_isrc (Track *track, char *isrc) track->isrc = strdup(isrc); } -char *track_get_isrc (Track *track) +char *track_get_isrc(Track *track) { return track->isrc; } -Cdtext *track_get_cdtext (Track *track) +Cdtext *track_get_cdtext(Track *track) { return track->cdtext; } -void track_add_index (Track *track, long index) +void track_add_index(Track *track, long index) { if (MAXTRACK - 1 > track->nindex) { track->nindex++; @@ -276,12 +276,12 @@ void track_add_index (Track *track, long index) track->index[track->nindex - 1] = index; } -int track_get_nindex (Track *track) +int track_get_nindex(Track *track) { return track->nindex; } -long track_get_index (Track *track, int i) +long track_get_index(Track *track, int i) { if (0 <= i < track->nindex) { return track->index[i]; @@ -293,7 +293,7 @@ long track_get_index (Track *track, int i) /* * dump cd information */ -void cd_track_dump (Track *track) +void cd_track_dump(Track *track) { int i; @@ -318,7 +318,7 @@ void cd_track_dump (Track *track) } } -void cd_dump (Cd *cd) +void cd_dump(Cd *cd) { int i; diff --git a/src/lib/cd.h b/src/lib/cd.h index 07f88a5..efcffab 100644 --- a/src/lib/cd.h +++ b/src/lib/cd.h @@ -77,85 +77,85 @@ typedef struct Cd Cd; typedef struct Track Track; /* return pointer to CD structure */ -Cd *cd_init (); +Cd *cd_init(); /* dump all info from CD structure * in human readable format (for debugging) */ -void cd_dump (Cd *cd); +void cd_dump(Cd *cd); /* * Cd functions */ -void cd_set_mode (Cd *cd, int mode); -int cd_get_mode (Cd *cd); +void cd_set_mode(Cd *cd, int mode); +int cd_get_mode(Cd *cd); -void cd_set_catalog (Cd *cd, char *catalog); -char *cd_get_catalog (Cd *cd); +void cd_set_catalog(Cd *cd, char *catalog); +char *cd_get_catalog(Cd *cd); /* * return pointer to cd's Cdtext */ -Cdtext *cd_get_cdtext (Cd *cd); +Cdtext *cd_get_cdtext(Cd *cd); /* * add a new track to cd, increment number of tracks * and return pointer to new track */ -Track *cd_add_track (Cd *cd); +Track *cd_add_track(Cd *cd); /* * return number of tracks in cd */ -int cd_get_ntrack (Cd *cd); +int cd_get_ntrack(Cd *cd); -Track *cd_get_track (Cd *cd, int i); +Track *cd_get_track(Cd *cd, int i); /* * Track functions */ /* filename of data file */ -void track_set_filename (Track *track, char *filename); -char *track_get_filename (Track *track); +void track_set_filename(Track *track, char *filename); +char *track_get_filename(Track *track); /* track start is starting position in data file */ -void track_set_start (Track *track, long start); -long track_get_start (Track *track); +void track_set_start(Track *track, long start); +long track_get_start(Track *track); /* track length is length of data file to use */ -void track_set_length (Track *track, long length); -long track_get_length (Track *track); +void track_set_length(Track *track, long length); +long track_get_length(Track *track); /* see enum TrackMode */ -void track_set_mode (Track *track, int mode); -int track_get_mode (Track *track); +void track_set_mode(Track *track, int mode); +int track_get_mode(Track *track); /* see enum TrackSubMode */ -void track_set_sub_mode (Track *track, int sub_mode); -int track_get_sub_mode (Track *track); +void track_set_sub_mode(Track *track, int sub_mode); +int track_get_sub_mode(Track *track); /* see enum TrackFlag */ -void track_set_flag (Track *track, int flag); -void track_clear_flag (Track *track, int flag); -int track_is_set_flag (Track *track, int flag); +void track_set_flag(Track *track, int flag); +void track_clear_flag(Track *track, int flag); +int track_is_set_flag(Track *track, int flag); /* zero data pregap */ -void track_set_zero_pre (Track *track, long length); -long track_get_zero_pre (Track *track); +void track_set_zero_pre(Track *track, long length); +long track_get_zero_pre(Track *track); /* zero data postgap */ -void track_set_zero_post (Track *track, long length); -long track_get_zero_post (Track *track); +void track_set_zero_post(Track *track, long length); +long track_get_zero_post(Track *track); -void track_set_isrc (Track *track, char *isrc); -char *track_get_isrc (Track *track); +void track_set_isrc(Track *track, char *isrc); +char *track_get_isrc(Track *track); -Cdtext *track_get_cdtext (Track *track); +Cdtext *track_get_cdtext(Track *track); -void track_add_index (Track *track, long index); -int track_get_nindex (Track *track); -long track_get_index (Track *track, int i); +void track_add_index(Track *track, long index); +int track_get_nindex(Track *track); +long track_get_index(Track *track, int i); #endif diff --git a/src/lib/cdtext.c b/src/lib/cdtext.c index 09df122..5c416be 100644 --- a/src/lib/cdtext.c +++ b/src/lib/cdtext.c @@ -16,7 +16,7 @@ struct Cdtext { char *value; }; -Cdtext *cdtext_init () +Cdtext *cdtext_init() { Cdtext *new_cdtext = NULL; @@ -50,7 +50,7 @@ Cdtext *cdtext_init () return new_cdtext; } -void cdtext_delete (Cdtext *cdtext) +void cdtext_delete(Cdtext *cdtext) { int i; @@ -63,7 +63,7 @@ void cdtext_delete (Cdtext *cdtext) } /* return 0 if there is no cdtext, returns non-zero otherwise */ -int cdtext_is_empty (Cdtext *cdtext) +int cdtext_is_empty(Cdtext *cdtext) { for (; PTI_END != cdtext->pti; cdtext++) { if (NULL != cdtext->value) { @@ -75,7 +75,7 @@ int cdtext_is_empty (Cdtext *cdtext) } /* sets cdtext's pti entry to field */ -void cdtext_set (int pti, char *value, Cdtext *cdtext) +void cdtext_set(int pti, char *value, Cdtext *cdtext) { if (NULL != value) { /* don't pass NULL to strdup */ for (; PTI_END != cdtext->pti; cdtext++) { @@ -88,7 +88,7 @@ void cdtext_set (int pti, char *value, Cdtext *cdtext) } /* returns value for pti, NULL if pti is not found */ -char *cdtext_get (int pti, Cdtext *cdtext) +char *cdtext_get(int pti, Cdtext *cdtext) { for (; PTI_END != cdtext->pti; cdtext++) { if (pti == cdtext->pti) { @@ -99,7 +99,7 @@ char *cdtext_get (int pti, Cdtext *cdtext) return NULL; } -const char *cdtext_get_key (int pti, int istrack) +const char *cdtext_get_key(int pti, int istrack) { char *key = NULL; @@ -160,7 +160,7 @@ const char *cdtext_get_key (int pti, int istrack) return key; } -void cdtext_dump (Cdtext *cdtext, int istrack) +void cdtext_dump(Cdtext *cdtext, int istrack) { int pti; char *value = NULL; diff --git a/src/lib/cdtext.h b/src/lib/cdtext.h index 884312a..2451af4 100644 --- a/src/lib/cdtext.h +++ b/src/lib/cdtext.h @@ -41,31 +41,31 @@ enum PtiFormat { typedef struct Cdtext Cdtext; /* return a pointer to a new Cdtext */ -Cdtext *cdtext_init (); +Cdtext *cdtext_init(); /* release a Cdtext */ -void cdtext_delete (Cdtext *cdtext); +void cdtext_delete(Cdtext *cdtext); /* returns non-zero if there are no CD-TEXT fields set, zero otherwise */ -int cdtext_is_empty (Cdtext *cdtext); +int cdtext_is_empty(Cdtext *cdtext); /* set CD-TEXT field to value for PTI pti */ -void cdtext_set (int pti, char *value, Cdtext *cdtext); +void cdtext_set(int pti, char *value, Cdtext *cdtext); /* returns pointer to CD-TEXT value for PTI pti */ -char *cdtext_get (int pti, Cdtext *cdtext); +char *cdtext_get(int pti, Cdtext *cdtext); /* * returns appropriate string for PTI pti * if istrack is zero, UPC/EAN string will be returned for PTI_UPC_ISRC * othwise ISRC string will be returned */ -const char *cdtext_get_key (int pti, int istrack); +const char *cdtext_get_key(int pti, int istrack); /* * dump all cdtext info * in human readable format (for debugging) */ -void cdtext_dump (Cdtext *cdtext, int istrack); +void cdtext_dump(Cdtext *cdtext, int istrack); #endif diff --git a/src/lib/cue.h b/src/lib/cue.h index 0c347e2..f127f9d 100644 --- a/src/lib/cue.h +++ b/src/lib/cue.h @@ -5,5 +5,5 @@ * For license terms, see the file COPYING in this distribution. */ -Cd *cue_parse (FILE *fp); -void cue_print (FILE *fp, Cd *cd); +Cd *cue_parse(FILE *fp); +void cue_print(FILE *fp, Cd *cd); diff --git a/src/lib/cuefile.c b/src/lib/cuefile.c index d011418..8b3817d 100644 --- a/src/lib/cuefile.c +++ b/src/lib/cuefile.c @@ -11,7 +11,7 @@ #include "cue.h" #include "toc.h" -Cd *cf_parse (char *name, int *format) +Cd *cf_parse(char *name, int *format) { FILE *fp = NULL; Cd *cd = NULL; @@ -46,7 +46,7 @@ Cd *cf_parse (char *name, int *format) return cd; } -int cf_print (char *name, int *format, Cd *cd) +int cf_print(char *name, int *format, Cd *cd) { FILE *fp = NULL; @@ -80,7 +80,7 @@ int cf_print (char *name, int *format, Cd *cd) return 0; } -int cf_format_from_suffix (char *name) +int cf_format_from_suffix(char *name) { char *suffix; if (0 != (suffix = strrchr(name, '.'))) { diff --git a/src/lib/cuefile.h b/src/lib/cuefile.h index 8c2578c..439c055 100644 --- a/src/lib/cuefile.h +++ b/src/lib/cuefile.h @@ -11,6 +11,6 @@ enum Format {CUE, TOC, UNKNOWN}; typedef struct Cue Cue; -Cd *cf_parse (char *fname, int *format); -int cf_print (char *fname, int *format, Cd *cue); -int cf_format_from_suffix (char *fname); +Cd *cf_parse(char *fname, int *format); +int cf_print(char *fname, int *format, Cd *cue); +int cf_format_from_suffix(char *fname); diff --git a/src/lib/time.c b/src/lib/time.c index 8b20853..e1dea34 100644 --- a/src/lib/time.c +++ b/src/lib/time.c @@ -8,12 +8,12 @@ #include #include -long time_msf_to_frame (int m, int s, int f) +long time_msf_to_frame(int m, int s, int f) { return (m * 60 + s) * 75 + f; } -void msf_frame_to_msf (long frame, int *m, int *s, int *f) +void msf_frame_to_msf(long frame, int *m, int *s, int *f) { *f = frame % 75; /* 0 <= frames <= 74 */ frame /= 75; @@ -22,7 +22,7 @@ void msf_frame_to_msf (long frame, int *m, int *s, int *f) *m = frame; /* 0 <= minutes */ } -void time_frame_to_msf (long frame, int *m, int *s, int *f) +void time_frame_to_msf(long frame, int *m, int *s, int *f) { *f = frame % 75; /* 0 <= frames <= 74 */ frame /= 75; @@ -32,7 +32,7 @@ void time_frame_to_msf (long frame, int *m, int *s, int *f) } /* print frame in mm:ss:ff format */ -char *time_frame_to_mmssff (long f) +char *time_frame_to_mmssff(long f) { static char msf[9]; int minutes, seconds, frames; diff --git a/src/lib/time.h b/src/lib/time.h index 822850e..1dbd130 100644 --- a/src/lib/time.h +++ b/src/lib/time.h @@ -8,9 +8,9 @@ #ifndef TIME_H #define TIME_H -long time_msf_to_frame (int m, int s, int f); -long time_mmssff_to_frame (char *mmssff); -void time_frame_to_msf (long frame, int *m, int *s, int *f); -char *time_frame_to_mmssff (long f); +long time_msf_to_frame(int m, int s, int f); +long time_mmssff_to_frame(char *mmssff); +void time_frame_to_msf(long frame, int *m, int *s, int *f); +char *time_frame_to_mmssff(long f); #endif diff --git a/src/lib/toc.h b/src/lib/toc.h index 736896a..3f18ce2 100644 --- a/src/lib/toc.h +++ b/src/lib/toc.h @@ -5,5 +5,5 @@ * For license terms, see the file COPYING in this distribution. */ -Cd *toc_parse (FILE *fp); -void toc_print (FILE *fp, Cd *cd); +Cd *toc_parse(FILE *fp); +void toc_print(FILE *fp, Cd *cd); diff --git a/src/tools/cuebreakpoints.c b/src/tools/cuebreakpoints.c index 15d517e..97b881c 100644 --- a/src/tools/cuebreakpoints.c +++ b/src/tools/cuebreakpoints.c @@ -29,7 +29,7 @@ char *progname; enum GapMode {APPEND, PREPEND, SPLIT}; /* Print usage information and exit */ -void usage (int status) +void usage(int status) { if (0 == status) { printf("Usage: %s [option...] [file...]\n", progname); @@ -50,14 +50,14 @@ void usage (int status) } /* Print version information and exit */ -void version () +void version() { printf("%s\n", PACKAGE_STRING); exit(0); } -void print_m_ss_ff (long frame) +void print_m_ss_ff(long frame) { int m, s, f; @@ -65,7 +65,7 @@ void print_m_ss_ff (long frame) printf ("%d:%02d.%02d\n", m, s, f); } -void print_breakpoint (long b) +void print_breakpoint(long b) { /* Do not print zero breakpoints. */ if (0 != b) { @@ -73,7 +73,7 @@ void print_breakpoint (long b) } } -void print_breaks (Cd *cd, int gaps) +void print_breaks(Cd *cd, int gaps) { int i; long b; @@ -107,7 +107,7 @@ void print_breaks (Cd *cd, int gaps) } } -int breaks (char *name, int format, int gaps) +int breaks(char *name, int format, int gaps) { Cd *cd = NULL; @@ -122,7 +122,7 @@ int breaks (char *name, int format, int gaps) return 0; } -int main (int argc, char *argv[]) +int main(int argc, char *argv[]) { int format = UNKNOWN; int gaps = APPEND; diff --git a/src/tools/cueconvert.c b/src/tools/cueconvert.c index 5faba66..d4d3bb2 100644 --- a/src/tools/cueconvert.c +++ b/src/tools/cueconvert.c @@ -20,7 +20,7 @@ char *progname; /* Print usage information and exit */ -void usage (int status) +void usage(int status) { if (0 == status) { printf("Usage: %s [option...] [infile [outfile]]\n", progname); @@ -39,14 +39,14 @@ void usage (int status) } /* Print version information and exit */ -void version () +void version() { printf("%s\n", PACKAGE_STRING); exit(0); } -int convert (char *iname, int iformat, char *oname, int oformat) +int convert(char *iname, int iformat, char *oname, int oformat) { Cd *cd = NULL; @@ -74,7 +74,7 @@ int convert (char *iname, int iformat, char *oname, int oformat) return cf_print(oname, &oformat, cd); } -int main (int argc, char *argv[]) +int main(int argc, char *argv[]) { int iformat = UNKNOWN; int oformat = UNKNOWN; diff --git a/src/tools/cueprint.c b/src/tools/cueprint.c index a7f3f36..fe2548a 100644 --- a/src/tools/cueprint.c +++ b/src/tools/cueprint.c @@ -62,7 +62,7 @@ typedef union { char *progname; /* Print usage information and exit */ -void usage (int status) +void usage(int status) { if (0 == status) { printf("Usage: %s [option...] [file...]\n", progname); @@ -88,7 +88,7 @@ void usage (int status) } /* Print version information and exit */ -void version () +void version() { printf("%s\n", PACKAGE_STRING); @@ -99,7 +99,7 @@ void version () * TODO: Shouldn't we be using vprintf() to help us out with this stuff? * (Branden Robinson) */ -void disc_field (char *conv, int length, Cd *cd, Value *value) +void disc_field(char *conv, int length, Cd *cd, Value *value) { char *c; /* pointer to conversion character */ @@ -162,7 +162,7 @@ void disc_field (char *conv, int length, Cd *cd, Value *value) } } -void track_field (char *conv, int length, Cd *cd, int trackno, Value *value) +void track_field(char *conv, int length, Cd *cd, int trackno, Value *value) { char *c; /* pointer to conversion character */ @@ -230,7 +230,7 @@ void track_field (char *conv, int length, Cd *cd, int trackno, Value *value) * Print a conversion specification. * [flag(s)][width][.precision] */ -void print_conv (char *start, int length, Cd *cd, int trackno) +void print_conv(char *start, int length, Cd *cd, int trackno) { char *conv; /* copy of conversion specification */ Value value; @@ -271,7 +271,7 @@ void print_conv (char *start, int length, Cd *cd, int trackno) free(conv); } -void cd_printf (char *format, Cd *cd, int trackno) +void cd_printf(char *format, Cd *cd, int trackno) { char *c; /* pointer into format */ char *conv_start; @@ -327,7 +327,7 @@ void cd_printf (char *format, Cd *cd, int trackno) } } -int info (char *name, int format, int trackno, char *d_template, char *t_template) +int info(char *name, int format, int trackno, char *d_template, char *t_template) { Cd *cd = NULL; int ntrack; @@ -417,7 +417,7 @@ void translate_escapes(char *s) *write = '\0'; } -int main (int argc, char *argv[]) +int main(int argc, char *argv[]) { int format = UNKNOWN; int trackno = -1; /* track number (-1 = unspecified,