Merge pull request #487 from cgzones/misc_warnings

Resolve several compiler warnings
This commit is contained in:
Serge Hallyn
2022-01-03 09:45:12 -06:00
committed by GitHub
18 changed files with 47 additions and 43 deletions

View File

@@ -17,7 +17,5 @@ extern struct map_range *get_map_ranges(int ranges, int argc, char **argv);
extern void write_mapping(int proc_dir_fd, int ranges,
struct map_range *mappings, const char *map_file, uid_t ruid);
extern void nss_init(char *nsswitch_path);
#endif /* _ID_MAPPING_H_ */

View File

@@ -248,7 +248,7 @@ extern struct spwd *prefix_getspnam(const char* name)
}
}
extern void prefix_setpwent()
extern void prefix_setpwent(void)
{
if (!passwd_db_file) {
setpwent();
@@ -261,7 +261,7 @@ extern void prefix_setpwent()
if (!fp_pwent)
return;
}
extern struct passwd* prefix_getpwent()
extern struct passwd* prefix_getpwent(void)
{
if (!passwd_db_file) {
return getpwent();
@@ -271,7 +271,7 @@ extern struct passwd* prefix_getpwent()
}
return fgetpwent(fp_pwent);
}
extern void prefix_endpwent()
extern void prefix_endpwent(void)
{
if (!passwd_db_file) {
endpwent();
@@ -282,7 +282,7 @@ extern void prefix_endpwent()
fp_pwent = NULL;
}
extern void prefix_setgrent()
extern void prefix_setgrent(void)
{
if (!group_db_file) {
setgrent();
@@ -295,14 +295,14 @@ extern void prefix_setgrent()
if (!fp_grent)
return;
}
extern struct group* prefix_getgrent()
extern struct group* prefix_getgrent(void)
{
if (!group_db_file) {
return getgrent();
}
return fgetgrent(fp_grent);
}
extern void prefix_endgrent()
extern void prefix_endgrent(void)
{
if (!group_db_file) {
endgrent();

View File

@@ -45,7 +45,7 @@ int shell (const char *file, /*@null@*/const char *arg, char *const envp[])
* don't want to tell us what it is themselves.
*/
if (arg == (char *) 0) {
(void) snprintf (arg0, sizeof arg0, "-%s", Basename ((char *) file));
(void) snprintf (arg0, sizeof arg0, "-%s", Basename (file));
arg0[sizeof arg0 - 1] = '\0';
arg = arg0;
}