[PATCH 15/16] cal: mark all functions static

Sami Kerola
2013-05-02T18:52:37Z

Proposed-by: Dave Reisner <dreisner@archlinux.org>
Reference: http://marc.info/?l=util-linux-ng&m=136717012419551&w=2
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
misc-utils/cal.c | 61 +++++++++++++++++++++++++++++---------------------------
1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index 127a855..78f092d 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -227,18 +227,18 @@ static int days_in_month[2][13] = {
static int leap_year(int year);
static int centuries_since_1700(int year, int centuries);
static int leap_years_since_year_1(int year);
-char * ascii_day(const int, char *, int);
-int center_str(const char* src, char* dest, size_t dest_size, size_t width);
-void center(const char *, size_t, int);
-void day_array(const int, const int, int, int, int, int *);
-int day_in_week(int, int, int);
-int day_in_year(int, int, int);
-void yearly(int, int, const int, const int, const char *, const char **);
-void do_monthly(const int, const int, const char *, const char **, int, int, int, struct fmt_st*);
-void monthly(const int, const int, const char *, const char **, int, int, int);
-void monthly3(const int, const int, const char *, const char **, int, int, int);
+static char * ascii_day(const int, char *, int);
+static int center_str(const char* src, char* dest, size_t dest_size, size_t width);
+static void center(const char *, size_t, int);
+static void day_array(const int, const int, int, int, int, int *);
+static int day_in_week(int, int, int);
+static int day_in_year(int, int, int);
+static void yearly(int, int, const int, const int, const char *, const char **);
+static void do_monthly(const int, const int, const char *, const char **, int, int, int, struct fmt_st*);
+static void monthly(const int, const int, const char *, const char **, int, int, int);
+static void monthly3(const int, const int, const char *, const char **, int, int, int);
static void __attribute__ ((__noreturn__)) usage(FILE * out);
-void headers_init(const int, const int, char *, const char **);
+static void headers_init(const int, const int, char *, const char **);

int
main(int argc, char **argv) {
@@ -461,8 +461,8 @@ static int leap_years_since_year_1(int year)
centuries_since_1700(year, 4));
}

-void headers_init(const int julian, const int weekstart, char *day_headings,
- const char **full_month)
+static void headers_init(const int julian, const int weekstart,
+ char *day_headings, const char **full_month)
{
int i, wd, spaces = julian ? J_DAY_LEN - 1 : DAY_LEN - 1;
char *cur_dh = day_headings;
@@ -485,9 +485,9 @@ void headers_init(const int julian, const int weekstart, char *day_headings,
full_month[i] = nl_langinfo(MON_1 + i);
}

-void do_monthly(const int julian, const int weekstart, const char *day_headings,
- const char **full_month, int day, int month, int year,
- struct fmt_st *out)
+static void do_monthly(const int julian, const int weekstart,
+ const char *day_headings, const char **full_month,
+ int day, int month, int year, struct fmt_st *out)
{
int col, row, days[MAXDAYS];
char *p, lineout[FMT_ST_CHARS];
@@ -521,8 +521,9 @@ void do_monthly(const int julian, const int weekstart, const char *day_headings,
}
}

-void monthly(const int julian, const int weekstart, const char *day_headings,
- const char **full_month, int day, int month, int year)
+static void monthly(const int julian, const int weekstart,
+ const char *day_headings, const char **full_month, int day,
+ int month, int year)
{
int i;
struct fmt_st out;
@@ -534,8 +535,9 @@ void monthly(const int julian, const int weekstart, const char *day_headings,
}
}

-void monthly3(const int julian, const int weekstart, const char *day_headings,
- const char **full_month, int day, int month, int year)
+static void monthly3(const int julian, const int weekstart,
+ const char *day_headings, const char **full_month, int day,
+ int month, int year)
{
char lineout[FMT_ST_CHARS];
int i;
@@ -590,8 +592,8 @@ void monthly3(const int julian, const int weekstart, const char *day_headings,
}
}

-void yearly(int day, int year, const int julian, const int weekstart,
- const char *day_headings, const char **full_month)
+static void yearly(int day, int year, const int julian, const int weekstart,
+ const char *day_headings, const char **full_month)
{
int col, *dp, i, month, row, which_cal;
int maxrow, sep_len, week_len;
@@ -655,8 +657,8 @@ void yearly(int day, int year, const int julian, const int weekstart,
* out end to end. You would have 42 numbers or spaces. This routine
* builds that array for any month from Jan. 1 through Dec. 9999.
*/
-void day_array(const int julian, const int weekstart, int day, int month,
- int year, int *days)
+static void day_array(const int julian, const int weekstart, int day, int month,
+ int year, int *days)
{
int julday, daynum, dw, dm;
int *sep1752;
@@ -687,7 +689,7 @@ void day_array(const int julian, const int weekstart, int day, int month,
* day_in_year --
* return the 1 based day number within the year
*/
-int day_in_year(int day, int month, int year)
+static int day_in_year(int day, int month, int year)
{
int i, leap;

@@ -704,7 +706,7 @@ int day_in_year(int day, int month, int year)
* 3 Sep. 1752 through 13 Sep. 1752. Returns Thursday for all
* missing days.
*/
-int day_in_week(int day, int month, int year)
+static int day_in_week(int day, int month, int year)
{
long temp;

@@ -719,7 +721,7 @@ int day_in_week(int day, int month, int year)
return(REFORMATION_WEEKDAY);
}

-char *ascii_day(const int julian, char *p, int day)
+static char *ascii_day(const int julian, char *p, int day)
{
int display, val;
int highlight = 0;
@@ -772,13 +774,14 @@ char *ascii_day(const int julian, char *p, int day)
* In addition if the string is too large for the width it's truncated.
* The number of trailing spaces may be 1 less than the number of leading spaces.
*/
-int center_str(const char *src, char *dest, size_t dest_size, size_t width)
+static int center_str(const char *src, char *dest, size_t dest_size,
+ size_t width)
{
return mbsalign(src, dest, dest_size, &width,
MBS_ALIGN_CENTER, MBA_UNIBYTE_FALLBACK);
}

-void center(const char *str, size_t len, int separate)
+static void center(const char *str, size_t len, int separate)
{
char lineout[FMT_ST_CHARS];

--
1.8.2.2