mirror of
https://github.com/sheumann/hush.git
synced 2024-12-26 10:32:02 +00:00
fix warning from needlessly-global functions
This commit is contained in:
parent
d77f7c3136
commit
769d1e05e6
@ -299,7 +299,7 @@ static int find_type(char *type)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
action*** parse_params(char **argv)
|
static action*** parse_params(char **argv)
|
||||||
{
|
{
|
||||||
action*** appp;
|
action*** appp;
|
||||||
int cur_group = 0;
|
int cur_group = 0;
|
||||||
|
@ -876,7 +876,7 @@ static int get_next_history(void)
|
|||||||
|
|
||||||
#if ENABLE_FEATURE_EDITING_SAVEHISTORY
|
#if ENABLE_FEATURE_EDITING_SAVEHISTORY
|
||||||
/* state->flags is already checked to be nonzero */
|
/* state->flags is already checked to be nonzero */
|
||||||
void load_history(const char *fromfile)
|
static void load_history(const char *fromfile)
|
||||||
{
|
{
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
int hi;
|
int hi;
|
||||||
@ -910,7 +910,7 @@ void load_history(const char *fromfile)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* state->flags is already checked to be nonzero */
|
/* state->flags is already checked to be nonzero */
|
||||||
void save_history(const char *tofile)
|
static void save_history(const char *tofile)
|
||||||
{
|
{
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
|
|
||||||
|
@ -13,6 +13,9 @@
|
|||||||
#ifdef __GLIBC__
|
#ifdef __GLIBC__
|
||||||
/* At least glibc has horrendously large inline for this, so wrap it */
|
/* At least glibc has horrendously large inline for this, so wrap it */
|
||||||
/* uclibc people please check - do we need "&& !__UCLIBC__" above? */
|
/* uclibc people please check - do we need "&& !__UCLIBC__" above? */
|
||||||
|
|
||||||
|
/* suppress gcc "no previous prototype" warning */
|
||||||
|
unsigned long long bb_makedev(unsigned int major, unsigned int minor);
|
||||||
unsigned long long bb_makedev(unsigned int major, unsigned int minor)
|
unsigned long long bb_makedev(unsigned int major, unsigned int minor)
|
||||||
{
|
{
|
||||||
return makedev(major, minor);
|
return makedev(major, minor);
|
||||||
|
@ -13,6 +13,8 @@
|
|||||||
//#include "libbb.h"
|
//#include "libbb.h"
|
||||||
extern void bb_perror_msg(const char *s, ...);
|
extern void bb_perror_msg(const char *s, ...);
|
||||||
|
|
||||||
|
/* suppress gcc "no previous prototype" warning */
|
||||||
|
void bb_perror_nomsg(void);
|
||||||
void bb_perror_nomsg(void)
|
void bb_perror_nomsg(void)
|
||||||
{
|
{
|
||||||
bb_perror_msg(0);
|
bb_perror_msg(0);
|
||||||
|
@ -13,6 +13,8 @@
|
|||||||
//#include "libbb.h"
|
//#include "libbb.h"
|
||||||
extern void bb_perror_msg_and_die(const char *s, ...);
|
extern void bb_perror_msg_and_die(const char *s, ...);
|
||||||
|
|
||||||
|
/* suppress gcc "no previous prototype" warning */
|
||||||
|
void bb_perror_nomsg_and_die(void);
|
||||||
void bb_perror_nomsg_and_die(void)
|
void bb_perror_nomsg_and_die(void)
|
||||||
{
|
{
|
||||||
bb_perror_msg_and_die(0);
|
bb_perror_msg_and_die(0);
|
||||||
|
14
procps/ps.c
14
procps/ps.c
@ -13,17 +13,17 @@
|
|||||||
|
|
||||||
/* Print value to buf, max size+1 chars (including trailing '\0') */
|
/* Print value to buf, max size+1 chars (including trailing '\0') */
|
||||||
|
|
||||||
void func_user(char *buf, int size, const procps_status_t *ps)
|
static void func_user(char *buf, int size, const procps_status_t *ps)
|
||||||
{
|
{
|
||||||
safe_strncpy(buf, get_cached_username(ps->uid), size+1);
|
safe_strncpy(buf, get_cached_username(ps->uid), size+1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void func_comm(char *buf, int size, const procps_status_t *ps)
|
static void func_comm(char *buf, int size, const procps_status_t *ps)
|
||||||
{
|
{
|
||||||
safe_strncpy(buf, ps->comm, size+1);
|
safe_strncpy(buf, ps->comm, size+1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void func_args(char *buf, int size, const procps_status_t *ps)
|
static void func_args(char *buf, int size, const procps_status_t *ps)
|
||||||
{
|
{
|
||||||
buf[0] = '\0';
|
buf[0] = '\0';
|
||||||
if (ps->cmd)
|
if (ps->cmd)
|
||||||
@ -32,22 +32,22 @@ void func_args(char *buf, int size, const procps_status_t *ps)
|
|||||||
snprintf(buf, size+1, "[%.*s]", size-2, ps->comm);
|
snprintf(buf, size+1, "[%.*s]", size-2, ps->comm);
|
||||||
}
|
}
|
||||||
|
|
||||||
void func_pid(char *buf, int size, const procps_status_t *ps)
|
static void func_pid(char *buf, int size, const procps_status_t *ps)
|
||||||
{
|
{
|
||||||
snprintf(buf, size+1, "%*u", size, ps->pid);
|
snprintf(buf, size+1, "%*u", size, ps->pid);
|
||||||
}
|
}
|
||||||
|
|
||||||
void func_ppid(char *buf, int size, const procps_status_t *ps)
|
static void func_ppid(char *buf, int size, const procps_status_t *ps)
|
||||||
{
|
{
|
||||||
snprintf(buf, size+1, "%*u", size, ps->ppid);
|
snprintf(buf, size+1, "%*u", size, ps->ppid);
|
||||||
}
|
}
|
||||||
|
|
||||||
void func_pgid(char *buf, int size, const procps_status_t *ps)
|
static void func_pgid(char *buf, int size, const procps_status_t *ps)
|
||||||
{
|
{
|
||||||
snprintf(buf, size+1, "%*u", size, ps->pgid);
|
snprintf(buf, size+1, "%*u", size, ps->pgid);
|
||||||
}
|
}
|
||||||
|
|
||||||
void func_rss(char *buf, int size, const procps_status_t *ps)
|
static void func_rss(char *buf, int size, const procps_status_t *ps)
|
||||||
{
|
{
|
||||||
char buf5[5];
|
char buf5[5];
|
||||||
smart_ulltoa5( ((unsigned long long)ps->rss) << 10, buf5);
|
smart_ulltoa5( ((unsigned long long)ps->rss) << 10, buf5);
|
||||||
|
Loading…
Reference in New Issue
Block a user