DeforaOS/utils
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2007-03-25 15:35:58 +00:00
parent 092b5b9b0e
commit 1398021ba8
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ls.c
View File

@ -1,5 +1,5 @@
/* $Id$ */ /* $Id$ */
/* Copyright (c) 2006 The DeforaOS Project */ /* Copyright (c) 2007 The DeforaOS Project */
/* TODO: use a dynamic array and qsort() instead of lists */ /* TODO: use a dynamic array and qsort() instead of lists */
@ -91,13 +91,16 @@ static int _prefs_parse(Prefs * prefs, int argc, char * argv[])
/* SList */ /* SList */
/* types */
/* SListCell */ /* SListCell */
typedef struct _SListCell { typedef struct _SListCell
{
void * data; void * data;
struct _SListCell * next; struct _SListCell * next;
} SListCell; } SListCell;
typedef SListCell * SList; typedef SListCell * SList;
/* functions */
static SListCell * _slistcell_new(void * data, SListCell * next) static SListCell * _slistcell_new(void * data, SListCell * next)
{ {
SListCell * slc; SListCell * slc;
@ -153,12 +156,12 @@ static void slist_next(SList * slist)
*slist = (*slist)->next; *slist = (*slist)->next;
} }
static void slist_apply(SList * slist, int (*func)(void *, void *), void * user) static void slist_apply(SList * slist, int (*func)(void *))
{ {
SListCell * slc = *slist; SListCell * slc = *slist;
for(slc = *slist; slc != NULL; slc = slc->next) for(slc = *slist; slc != NULL; slc = slc->next)
func(slc->data, user); func(slc->data);
} }
static int slist_insert_sorted(SList * slist, void * data, static int slist_insert_sorted(SList * slist, void * data,
@ -353,7 +356,7 @@ static int _ls_do(Prefs * prefs, int argc, char * directory, SList * files,
return res; return res;
} }
static int _ls_free(void * data, void * user); static int _ls_free(void * data);
static int _ls_do_files_short(Prefs * prefs, char * directory, SList * files); static int _ls_do_files_short(Prefs * prefs, char * directory, SList * files);
static int _ls_do_files_long(Prefs * prefs, char * directory, SList * files); static int _ls_do_files_long(Prefs * prefs, char * directory, SList * files);
static int _ls_do_files(Prefs * prefs, char * directory, SList * files) static int _ls_do_files(Prefs * prefs, char * directory, SList * files)
@ -364,7 +367,7 @@ static int _ls_do_files(Prefs * prefs, char * directory, SList * files)
res = _ls_do_files_long(prefs, directory, files); res = _ls_do_files_long(prefs, directory, files);
else else
res = _ls_do_files_short(prefs, directory, files); res = _ls_do_files_short(prefs, directory, files);
slist_apply(files, _ls_free, NULL); slist_apply(files, _ls_free);
slist_delete(files); slist_delete(files);
return res; return res;
} }
@ -622,7 +625,7 @@ static void _print_link(char const * filename)
printf("%s%s", " -> ", buf); printf("%s%s", " -> ", buf);
} }
static int _ls_free(void * data, void * user) static int _ls_free(void * data)
{ {
free(data); free(data);
return 0; return 0;
@ -643,7 +646,7 @@ static int _ls_do_dirs(Prefs * prefs, int argc, SList * dirs)
eol = "\n"; eol = "\n";
res += _ls_directory_do(prefs, dir); res += _ls_directory_do(prefs, dir);
} }
slist_apply(dirs, _ls_free, NULL); slist_apply(dirs, _ls_free);
slist_delete(dirs); slist_delete(dirs);
return res; return res;
} }