From 7943d1eb2be34569829dfc2812a1bf4f6a6eb4d0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 24 Mar 2010 21:05:23 +0100 Subject: don't export functions that should not be exported Signed-off-by: Lennart Poettering Acked-by: Dhaval Giani Signed-off-by: Dhaval Giani --- src/api.c | 6 +++--- src/config.c | 8 ++++---- src/daemon/cgrulesengd.c | 10 +++++----- src/parse.y | 4 ++-- src/tools/cgclassify.c | 6 +++--- src/tools/cgget.c | 12 ++++++------ src/tools/cgset.c | 4 ++-- src/tools/lscgroup.c | 14 +++++++------- src/tools/lssubsys.c | 8 ++++---- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/api.c b/src/api.c index 605137b..0370b01 100644 --- a/src/api.c +++ b/src/api.c @@ -1180,7 +1180,7 @@ err: * * Create a duplicate copy of values under the specified controller */ -int cgroup_copy_controller_values(struct cgroup_controller *dst, +static int cgroup_copy_controller_values(struct cgroup_controller *dst, struct cgroup_controller *src) { int i, ret = 0; @@ -1380,7 +1380,7 @@ err: * Caller is responsible to free the returned string! * @return 0 on success, >0 on error. */ -int cgroup_find_parent(struct cgroup *cgroup, char **parent) +static int cgroup_find_parent(struct cgroup *cgroup, char **parent) { char child_path[FILENAME_MAX]; char *parent_path = NULL; @@ -2708,7 +2708,7 @@ int cgroup_walk_tree_set_flags(void **handle, int flags) * This parses a stat line which is in the form of (name value) pair * separated by a space. */ -int cg_read_stat(FILE *fp, struct cgroup_stat *stat) +static int cg_read_stat(FILE *fp, struct cgroup_stat *stat) { int ret = 0; char *line = NULL; diff --git a/src/config.c b/src/config.c index 9c62b01..98eace3 100644 --- a/src/config.c +++ b/src/config.c @@ -387,7 +387,7 @@ void cgroup_config_cleanup_namespace_table(void) /* * Start mounting the mount table. */ -int cgroup_config_mount_fs(void) +static int cgroup_config_mount_fs(void) { int ret; struct stat buff; @@ -425,7 +425,7 @@ int cgroup_config_mount_fs(void) /* * Actually create the groups once the parsing has been finished. */ -int cgroup_config_create_groups(void) +static int cgroup_config_create_groups(void) { int error = 0; int i; @@ -444,7 +444,7 @@ int cgroup_config_create_groups(void) /* * Destroy the cgroups */ -int cgroup_config_destroy_groups(void) +static int cgroup_config_destroy_groups(void) { int error = 0; int i; @@ -461,7 +461,7 @@ int cgroup_config_destroy_groups(void) /* * Unmount the controllers */ -int cgroup_config_unmount_controllers(void) +static int cgroup_config_unmount_controllers(void) { int i; int error; diff --git a/src/daemon/cgrulesengd.c b/src/daemon/cgrulesengd.c index c39aacc..c65908a 100644 --- a/src/daemon/cgrulesengd.c +++ b/src/daemon/cgrulesengd.c @@ -73,7 +73,7 @@ int loglevel; * @param msg The error message to print (printf style) * @param ... Any args to msg (printf style) */ -void usage(FILE* fd, const char* msg, ...) +static void usage(FILE* fd, const char* msg, ...) { /* List of args to msg */ va_list ap; @@ -428,7 +428,7 @@ int cgre_process_event(const struct proc_event *ev, const int type) * @param cn_hdr The netlink message * @return 0 on success, > 0 on error */ -int cgre_handle_msg(struct cn_msg *cn_hdr) +static int cgre_handle_msg(struct cn_msg *cn_hdr) { /* The event to consider */ struct proc_event *ev; @@ -474,7 +474,7 @@ int cgre_handle_msg(struct cn_msg *cn_hdr) return ret; } -int cgre_receive_netlink_msg(int sk_nl) +static int cgre_receive_netlink_msg(int sk_nl) { char buff[BUFF_SIZE]; size_t recv_len; @@ -520,7 +520,7 @@ int cgre_receive_netlink_msg(int sk_nl) return 0; } -void cgre_receive_unix_domain_msg(int sk_unix) +static void cgre_receive_unix_domain_msg(int sk_unix) { int flags; int fd_client; @@ -562,7 +562,7 @@ close: return; } -int cgre_create_netlink_socket_process_msg() +static int cgre_create_netlink_socket_process_msg(void) { int sk_nl = 0, sk_unix = 0, sk_max; struct sockaddr_nl my_nla; diff --git a/src/parse.y b/src/parse.y index 47abee6..7bd797e 100644 --- a/src/parse.y +++ b/src/parse.y @@ -24,7 +24,7 @@ int yylex(void); extern int line_no; extern char *yytext; -void yyerror(char *s) +static void yyerror(const char *s) { fprintf(stderr, "error at line number %d at %s:%s\n", line_no, yytext, s); @@ -94,7 +94,7 @@ group_conf return $$; } } - | group_conf ID '{' namevalue_conf '}' + | group_conf ID '{' namevalue_conf '}' { $$ = cgroup_config_parse_controller_options($2, $4); if (!$$) { diff --git a/src/tools/cgclassify.c b/src/tools/cgclassify.c index f12fb22..a0d047b 100644 --- a/src/tools/cgclassify.c +++ b/src/tools/cgclassify.c @@ -34,7 +34,7 @@ /* * Change process group as specified on command line. */ -int change_group_path(pid_t pid, struct cgroup_group_spec *cgroup_list[]) +static int change_group_path(pid_t pid, struct cgroup_group_spec *cgroup_list[]) { int i; int ret = 0; @@ -57,7 +57,7 @@ int change_group_path(pid_t pid, struct cgroup_group_spec *cgroup_list[]) /* * Change process group as specified in cgrules.conf. */ -int change_group_based_on_rule(pid_t pid) +static int change_group_based_on_rule(pid_t pid) { uid_t euid; gid_t egid; @@ -92,7 +92,7 @@ out: } static struct option longopts[] = { - {"sticky", no_argument, NULL, 's'}, + {"sticky", no_argument, NULL, 's'}, {0, 0, 0, 0} }; diff --git a/src/tools/cgget.c b/src/tools/cgget.c index 380e392..661011b 100644 --- a/src/tools/cgget.c +++ b/src/tools/cgget.c @@ -14,7 +14,7 @@ #define MODE_SHOW_ALL_CONTROLLERS 4 -void usage(int status, char *program_name) +static void usage(int status, const char *program_name) { if (status != 0) fprintf(stderr, "Wrong input parameters," @@ -26,7 +26,7 @@ void usage(int status, char *program_name) } } -int display_one_record(char *name, struct cgroup_controller *group_controller, +static int display_one_record(char *name, struct cgroup_controller *group_controller, const char *program_name, int mode) { int ret; @@ -71,7 +71,7 @@ int display_one_record(char *name, struct cgroup_controller *group_controller, } -int display_name_values(char **names, int count, const char* group_name, +static int display_name_values(char **names, int count, const char* group_name, const char *program_name, int mode) { int i; @@ -136,7 +136,7 @@ err: return ret; } -int display_controller_values(char **controllers, int count, +static int display_controller_values(char **controllers, int count, const char *group_name, const char *program_name, int mode) { struct cgroup *group = NULL; @@ -201,7 +201,7 @@ err: } -int display_all_controllers(const char *group_name, +static int display_all_controllers(const char *group_name, const char *program_name, int mode) { void *handle; @@ -224,7 +224,7 @@ int display_all_controllers(const char *group_name, return succ; } -int add_record_to_buffer(int *p_number, +static int add_record_to_buffer(int *p_number, int *p_max, char ***p_records, char *new_rec) { diff --git a/src/tools/cgset.c b/src/tools/cgset.c index 7562956..c631e0f 100644 --- a/src/tools/cgset.c +++ b/src/tools/cgset.c @@ -26,7 +26,7 @@ static struct option const long_options[] = int flags; /* used input method */ -struct cgroup *copy_name_value_from_cgroup(char src_cg_path[FILENAME_MAX]) +static struct cgroup *copy_name_value_from_cgroup(char src_cg_path[FILENAME_MAX]) { int ret = 0; struct cgroup *src_cgroup; @@ -55,7 +55,7 @@ scgroup_err: } -void usage(int status, char *program_name) +static void usage(int status, const char *program_name) { if (status != 0) fprintf(stderr, "Wrong input parameters," diff --git a/src/tools/lscgroup.c b/src/tools/lscgroup.c index ca846e0..a99d26f 100644 --- a/src/tools/lscgroup.c +++ b/src/tools/lscgroup.c @@ -38,7 +38,7 @@ static inline void trim_filepath(char *path) path[len + 1] = '\0'; } -void usage(int status, char *program_name) +static void usage(int status, const char *program_name) { if (status != 0) { fprintf(stderr, "Wrong input parameters," @@ -55,8 +55,8 @@ void usage(int status, char *program_name) * if the info about controller "name" should be printed, * then the function returns nonzero value */ -int is_ctlr_on_list(struct cgroup_group_spec *cgroup_list, - char name[FILENAME_MAX]) +static int is_ctlr_on_list(struct cgroup_group_spec *cgroup_list, + const char *name) { int j; @@ -67,7 +67,7 @@ int is_ctlr_on_list(struct cgroup_group_spec *cgroup_list, return 0; } -void print_info(struct cgroup_file_info *info, char *name, int pref) +static void print_info(struct cgroup_file_info *info, char *name, int pref) { if (info->type == CGROUP_FILE_TYPE_DIR) { if (info->full_path[pref] == '/') @@ -78,7 +78,7 @@ void print_info(struct cgroup_file_info *info, char *name, int pref) } /* display controller:/input_path cgroups */ -int display_controller_data(char *input_path, char *controller, char *name) +static int display_controller_data(char *input_path, char *controller, char *name) { int ret; void *handle; @@ -120,7 +120,7 @@ int display_controller_data(char *input_path, char *controller, char *name) * the cgroup it returns ECGEOF */ -int print_cgroup(struct cgroup_group_spec *cgroup_spec, int flags) +static int print_cgroup(struct cgroup_group_spec *cgroup_spec, int flags) { int ret = 0; void *handle; @@ -191,7 +191,7 @@ int print_cgroup(struct cgroup_group_spec *cgroup_spec, int flags) } -int cgroup_list_cgroups(char *tname, +static int cgroup_list_cgroups(char *tname, struct cgroup_group_spec *cgroup_list[], int flags) { diff --git a/src/tools/lssubsys.c b/src/tools/lssubsys.c index ebb59b1..3e3a3dd 100644 --- a/src/tools/lssubsys.c +++ b/src/tools/lssubsys.c @@ -27,7 +27,7 @@ enum flag{ typedef char cont_name_t[FILENAME_MAX]; -void usage(int status, char *program_name) +static void usage(int status, const char *program_name) { if (status != 0) { fprintf(stderr, "Wrong input parameters," @@ -45,7 +45,7 @@ void usage(int status, char *program_name) } /* print data about input cont_name controller */ -int print_controller(cont_name_t cont_name, int flags) +static int print_controller(cont_name_t cont_name, int flags) { int ret = 0; char name[FILENAME_MAX]; @@ -114,7 +114,7 @@ int print_controller(cont_name_t cont_name, int flags) } /* list the controllers */ -int cgroup_list_controllers(char *tname, +static int cgroup_list_controllers(const char *tname, cont_name_t cont_name[CG_CONTROLLER_MAX], int flags) { int ret = 0; @@ -163,7 +163,7 @@ int cgroup_list_controllers(char *tname, return final_ret; } -int cgroup_list_all_controllers(char *tname) +static int cgroup_list_all_controllers(const char *tname) { int ret = 0; void *handle; -- cgit