On Sat, Dec 18, 2010 at 9:58 AM, Allan McRae <[email protected]> wrote: > Always declare a function with (void) rather than () when we expect > no arguements. Fixes all warnings with -Wstrict-prototypes.
Besides the spelling error in the commit message this looks good. I had fixed most of these in the code itself but apparantly never looked at the public header, whoops! > Signed-off-by: Allan McRae <[email protected]> > --- > lib/libalpm/alpm.h | 44 ++++++++++++++++++++++---------------------- > lib/libalpm/be_package.c | 2 +- > lib/libalpm/handle.h | 2 +- > lib/libalpm/util.h | 4 ++-- > src/pacman/sync.c | 2 +- > src/util/pactree.c | 2 +- > 6 files changed, 28 insertions(+), 28 deletions(-) > > diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h > index 86212a4..e17300f 100644 > --- a/lib/libalpm/alpm.h > +++ b/lib/libalpm/alpm.h > @@ -97,69 +97,69 @@ typedef int (*alpm_cb_fetch)(const char *url, const char > *localpath, > * Options > */ > > -alpm_cb_log alpm_option_get_logcb(); > +alpm_cb_log alpm_option_get_logcb(void); > void alpm_option_set_logcb(alpm_cb_log cb); > > -alpm_cb_download alpm_option_get_dlcb(); > +alpm_cb_download alpm_option_get_dlcb(void); > void alpm_option_set_dlcb(alpm_cb_download cb); > > -alpm_cb_fetch alpm_option_get_fetchcb(); > +alpm_cb_fetch alpm_option_get_fetchcb(void); > void alpm_option_set_fetchcb(alpm_cb_fetch cb); > > -alpm_cb_totaldl alpm_option_get_totaldlcb(); > +alpm_cb_totaldl alpm_option_get_totaldlcb(void); > void alpm_option_set_totaldlcb(alpm_cb_totaldl cb); > > -const char *alpm_option_get_root(); > +const char *alpm_option_get_root(void); > int alpm_option_set_root(const char *root); > > -const char *alpm_option_get_dbpath(); > +const char *alpm_option_get_dbpath(void); > int alpm_option_set_dbpath(const char *dbpath); > > -alpm_list_t *alpm_option_get_cachedirs(); > +alpm_list_t *alpm_option_get_cachedirs(void); > int alpm_option_add_cachedir(const char *cachedir); > void alpm_option_set_cachedirs(alpm_list_t *cachedirs); > int alpm_option_remove_cachedir(const char *cachedir); > > -const char *alpm_option_get_logfile(); > +const char *alpm_option_get_logfile(void); > int alpm_option_set_logfile(const char *logfile); > > -const char *alpm_option_get_lockfile(); > +const char *alpm_option_get_lockfile(void); > /* no set_lockfile, path is determined from dbpath */ > > -int alpm_option_get_usesyslog(); > +int alpm_option_get_usesyslog(void); > void alpm_option_set_usesyslog(int usesyslog); > > -alpm_list_t *alpm_option_get_noupgrades(); > +alpm_list_t *alpm_option_get_noupgrades(void); > void alpm_option_add_noupgrade(const char *pkg); > void alpm_option_set_noupgrades(alpm_list_t *noupgrade); > int alpm_option_remove_noupgrade(const char *pkg); > > -alpm_list_t *alpm_option_get_noextracts(); > +alpm_list_t *alpm_option_get_noextracts(void); > void alpm_option_add_noextract(const char *pkg); > void alpm_option_set_noextracts(alpm_list_t *noextract); > int alpm_option_remove_noextract(const char *pkg); > > -alpm_list_t *alpm_option_get_ignorepkgs(); > +alpm_list_t *alpm_option_get_ignorepkgs(void); > void alpm_option_add_ignorepkg(const char *pkg); > void alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs); > int alpm_option_remove_ignorepkg(const char *pkg); > > -alpm_list_t *alpm_option_get_ignoregrps(); > +alpm_list_t *alpm_option_get_ignoregrps(void); > void alpm_option_add_ignoregrp(const char *grp); > void alpm_option_set_ignoregrps(alpm_list_t *ignoregrps); > int alpm_option_remove_ignoregrp(const char *grp); > > -const char *alpm_option_get_arch(); > +const char *alpm_option_get_arch(void); > void alpm_option_set_arch(const char *arch); > > -int alpm_option_get_usedelta(); > +int alpm_option_get_usedelta(void); > void alpm_option_set_usedelta(int usedelta); > > -int alpm_option_get_checkspace(); > +int alpm_option_get_checkspace(void); > void alpm_option_set_checkspace(int checkspace); > > -pmdb_t *alpm_option_get_localdb(); > -alpm_list_t *alpm_option_get_syncdbs(); > +pmdb_t *alpm_option_get_localdb(void); > +alpm_list_t *alpm_option_get_syncdbs(void); > > /* > * Install reasons -- ie, why the package was installed > @@ -407,9 +407,9 @@ typedef void (*alpm_trans_cb_conv)(pmtransconv_t, void *, > void *, > /* Transaction Progress callback */ > typedef void (*alpm_trans_cb_progress)(pmtransprog_t, const char *, int, > size_t, size_t); > > -int alpm_trans_get_flags(); > -alpm_list_t * alpm_trans_get_add(); > -alpm_list_t * alpm_trans_get_remove(); > +int alpm_trans_get_flags(void); > +alpm_list_t * alpm_trans_get_add(void); > +alpm_list_t * alpm_trans_get_remove(void); > int alpm_trans_init(pmtransflag_t flags, > alpm_trans_cb_event cb_event, alpm_trans_cb_conv conv, > alpm_trans_cb_progress cb_progress); > diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c > index 2416dc8..6426fe9 100644 > --- a/lib/libalpm/be_package.c > +++ b/lib/libalpm/be_package.c > @@ -131,7 +131,7 @@ int _package_changelog_close(const pmpkg_t *pkg, void *fp) > * lets us only initialize an operations struct once which can always be > * accessed by this method. > */ > -static struct pkg_operations *get_file_pkg_ops() > +static struct pkg_operations *get_file_pkg_ops(void) > { > static struct pkg_operations *file_pkg_ops = NULL; > /* determine whether our static file_pkg_ops struct has been > initialized */ > diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h > index 46414b9..b471ea6 100644 > --- a/lib/libalpm/handle.h > +++ b/lib/libalpm/handle.h > @@ -66,7 +66,7 @@ typedef struct _pmhandle_t { > /* global handle variable */ > extern pmhandle_t *handle; > > -pmhandle_t *_alpm_handle_new(); > +pmhandle_t *_alpm_handle_new(void); > void _alpm_handle_free(pmhandle_t *handle); > > #endif /* _ALPM_HANDLE_H */ > diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h > index dfdc6a7..543643b 100644 > --- a/lib/libalpm/util.h > +++ b/lib/libalpm/util.h > @@ -79,8 +79,8 @@ int _alpm_makepath(const char *path); > int _alpm_makepath_mode(const char *path, mode_t mode); > int _alpm_copyfile(const char *src, const char *dest); > char *_alpm_strtrim(char *str); > -int _alpm_lckmk(); > -int _alpm_lckrm(); > +int _alpm_lckmk(void); > +int _alpm_lckrm(void); > int _alpm_unpack_single(const char *archive, const char *prefix, const char > *fn); > int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, > int breakfirst); > int _alpm_rmrf(const char *path); > diff --git a/src/pacman/sync.c b/src/pacman/sync.c > index f9d12e4..6961f3c 100644 > --- a/src/pacman/sync.c > +++ b/src/pacman/sync.c > @@ -571,7 +571,7 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t > *targets) > return(0); > } > > -static alpm_list_t *syncfirst() { > +static alpm_list_t *syncfirst(void) { > alpm_list_t *i, *res = NULL; > > for(i = config->syncfirst; i; i = alpm_list_next(i)) { > diff --git a/src/util/pactree.c b/src/util/pactree.c > index 5e86967..967f5c8 100644 > --- a/src/util/pactree.c > +++ b/src/util/pactree.c > @@ -54,7 +54,7 @@ int reverse = 0; > int unique = 0; > char *dbpath = NULL; > > -static int alpm_local_init() > +static int alpm_local_init(void) > { > int ret; > > -- > 1.7.3.3 > > >
