From: <enl...@li...> - 2006-02-18 12:39:26
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : proto Dir : e17/proto/extrackt/src/bin Modified Files: cddb.c cddev.c command.c http.c oldfunctions.c Log Message: Whitespace removal, extra blank lines removed =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/extrackt/src/bin/cddb.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- cddb.c 7 Feb 2006 01:35:14 -0000 1.1 +++ cddb.c 18 Feb 2006 12:39:21 -0000 1.2 @@ -199,7 +199,6 @@ void ex_cddb_default_set(Ex_Disc_Data *dd, int numtracks) { - int t; for(t=0; t < numtracks; t++) @@ -215,10 +214,8 @@ dd->year = 0; dd->genre = 7; dd->id3genre = -1; - } - /* will receive the header of our own protocol, the request * to the cddb server. it makes the comunication process * in a child @@ -226,7 +223,6 @@ void ex_cddb_request_send(Extrackt *ex, char *header, char *request) { - pid_t pid; char *response; @@ -281,7 +277,6 @@ } } - /* find all the discs that match */ void ex_cddb_match_find(Extrackt *ex) @@ -298,8 +293,7 @@ sprintf(request, "%s+%d",request, ex->disc_info.length.mins*60 + ex->disc_info.length.secs); - ex_cddb_request_send(ex,"DBMF",request); - + ex_cddb_request_send(ex,"DBMF",request); } /* get the disc info associated with the list id */ @@ -317,7 +311,6 @@ void ex_cddb_response_find_parse(Extrackt *ex, char *response) { - char *genre; char *id; char *line; @@ -330,8 +323,7 @@ /* store the info and request the data */ ex_cddb_match_get(ex,genre,id); - } - + } } void @@ -388,7 +380,6 @@ int ex_id3_genre_value(char *genre) { - int i; for(i=0; id3_genres[i].name; i++) { @@ -484,8 +475,7 @@ st = strtok(NULL, ""); if(st == NULL) return; - - + sprintf(data->track[track].name, "%s", st); len = strlen(data->track[track].number); @@ -527,8 +517,6 @@ snprintf(data->playlist + len, 256 - len, "%s", inbuffer + 10); } } - - /* get the pointer to data from a line without the * \n \0 . (end of cddb protocol) =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/extrackt/src/bin/cddev.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- cddev.c 7 Feb 2006 01:35:14 -0000 1.1 +++ cddev.c 18 Feb 2006 12:39:21 -0000 1.2 @@ -429,8 +429,7 @@ ex->disc_info.disc_mode=CDAUDIO_COMPLETED; break; } -#endif - +#endif if(read_toc) ex_cddev_toc_read(ex); @@ -811,7 +810,6 @@ return TRUE; } - /* CD Changer routines */ /* Choose a particular disc from the CD changer */ @@ -862,7 +860,6 @@ int ex_cddev_track_size(Ex_Track_Info *track) { - int start_sector; int end_sector; int size; @@ -874,6 +871,4 @@ printf("the file will have this size %d\n", size); return size; - - } =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/extrackt/src/bin/command.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- command.c 7 Feb 2006 01:35:14 -0000 1.1 +++ command.c 18 Feb 2006 12:39:21 -0000 1.2 @@ -20,7 +20,6 @@ astr = ex_string_escape(tmp); \ } - /* local subsystem internal functions */ /**************************************/ char *_ex_command_translate(char *istr, Extrackt *ex, Ex_Config_Exe_Type ext, int escape); @@ -30,7 +29,6 @@ static int rip_pid; static int enc_pid; - /* FIXME make a list of chars that need to be replaced/escaped */ char * ex_string_escape(char *str) @@ -90,8 +88,6 @@ } } } - - } int @@ -119,7 +115,6 @@ char * ex_string_file_extension_get(char *file) { - char *ext; ext = rindex(file,'.') + 1; @@ -133,26 +128,22 @@ printf("error deleting file\n"); } - /* will tranlsate something like %e/%A/%t.mp3 (istr) => * mp3/Bob\ Marley/01.mp3 (ostr) */ char ** ex_command_translate(Extrackt *ex, Ex_Config_Exe_Type ext) { - char *istr; char *l; char **argv; int argc; - - + Ex_Config_Exe *exe; /* put the exe on the first element of the array */ argv = (char **)E_NEW(1, char *); - - + if(ext == EX_CONFIG_EXE_RIPPER) { exe = ex->rip.ripper; @@ -178,7 +169,6 @@ argv = (char **)realloc(argv,sizeof(char *) * (argc + 1)); argv[argc] = NULL; - return argv; } @@ -200,14 +190,12 @@ Ex_Config_Exe *exe; if(ext == EX_CONFIG_EXE_RIPPER) - { - + { exe = ex->rip.ripper; tracknumber = ex->rip.tracks->data; } else - { - + { exe = ex->encode.encoder; tracknumber = ex->encode.tracks->data; } @@ -327,8 +315,7 @@ buf[i] = '\0'; ostr = E_STRDUP(buf); E_FREE(buf); - return ostr; - + return ostr; } void @@ -433,7 +420,6 @@ return; } return; - } int @@ -533,10 +519,8 @@ return; } return; - } - void ex_command_rip_append(Extrackt *ex, int tracknumber) { @@ -551,11 +535,9 @@ ex->encode.num_total++; } - int ex_command_rip_update(Extrackt *ex) { - double percent; char *percentstring; struct stat s; @@ -632,7 +614,6 @@ while(ex->rip.tracks) ex->rip.tracks = evas_list_remove_list(ex->rip.tracks,ex->rip.tracks); - } void =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/extrackt/src/bin/http.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- http.c 7 Feb 2006 01:35:14 -0000 1.1 +++ http.c 18 Feb 2006 12:39:21 -0000 1.2 @@ -9,8 +9,7 @@ int ex_http_connection_open(char * server, int port) -{ - +{ int sock; #ifdef USE_IPV6 struct addrinfo hints, *res, *res0; @@ -84,7 +83,6 @@ int ex_http_line_read(int sock, char * buf, int size) { - int i = 0; while (i < size - 1) @@ -128,7 +126,6 @@ char * ex_http_get(char * url) { - char *server, getstr[1024], *buf = NULL, *bptr; char *gs, *gc, *turl = url; int sock, n, bsize, port = 0; @@ -224,5 +221,3 @@ */ return buf; } - - =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/extrackt/src/bin/oldfunctions.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- oldfunctions.c 7 Feb 2006 01:35:14 -0000 1.1 +++ oldfunctions.c 18 Feb 2006 12:39:21 -0000 1.2 @@ -26,7 +26,6 @@ /* cache functions */ /*******************/ - /* See if a disc is in the local database */ int ex_cddb_disc_cached(Extrackt *ex) |