Make prototypes internal to cal.c and view.c

diff --git a/src/cal.c b/src/cal.c
index 9a40308b5b8db239def241c4c671f91ea459f2cf..72f360a186558109f4dfcb6873e46d7cebb190e2 100644 (file)
--- a/src/cal.c
+++ b/src/cal.c
@@ -21,6 +21,18 @@
 #include "date.h"
 #include "cal.h"
 
+/* Macros */
+#define CAL(name) \
+       event_t *name##_events(cal_t *cal, year_t year, month_t month, day_t day, int days); \
+       todo_t  *name##_todos(cal_t *cal, year_t year, month_t month, day_t day, int days)
+
+/* Prototypes */
+CAL(dummy);
+CAL(ical);
+
+event_t *cal_events(year_t year, month_t month, day_t day, int days);
+todo_t  *cal_todos(year_t year, month_t month, day_t day, int days);
+
 /* Global data */
 event_t *EVENTS;
 todo_t  *TODOS;

diff --git a/src/cal.h b/src/cal.h
index 83d9def58c258d56f036c02f355492cc466a5c6f..5a03c2ef7a7703f4aced2f0cf65ef846b444342a 100644 (file)
--- a/src/cal.h
+++ b/src/cal.h
@@ -57,16 +57,6 @@ extern todo_t  *TODOS;
 
 /* Calendar functions */
 void cal_init(void);
-event_t *cal_events(year_t year, month_t month, day_t day, int days);
-todo_t  *cal_todos(year_t year, month_t month, day_t day, int days);
-
-/* Calendar event functions */
-event_t *dummy_events(cal_t *cal, year_t year, month_t month, day_t day, int days);
-event_t *ical_events(cal_t *cal, year_t year, month_t month, day_t day, int days);
-
-/* Calendar todo functions */
-todo_t  *dummy_todos(cal_t *cal, year_t year, month_t month, day_t day, int days);
-todo_t  *ical_todos(cal_t *cal, year_t year, month_t month, day_t day, int days);
 
 /* Test fuctions */
 void ical_test(void);

diff --git a/src/view.c b/src/view.c
index 437e69c1ec693e260afedf6d14988e31b40a5c10..3417676c783a7d163cc36bb612a1f186a94d81e2 100644 (file)
--- a/src/view.c
+++ b/src/view.c
@@ -36,6 +36,23 @@ typedef struct {
        WINDOW *win;
 } view_t;
 
+/* Macros */
+#define VIEW(name)                     \
+       void name##_init(WINDOW *win); \
+       void name##_size(int,int);     \
+       void name##_draw(void);        \
+       int  name##_run(int,mmask_t,int,int)
+
+/* Prototypes */
+VIEW(day);
+VIEW(week);
+VIEW(month);
+VIEW(year);
+VIEW(events);
+VIEW(todo);
+VIEW(settings);
+VIEW(help);
+
 /* View data */
 view_t views[] = {
        { "Day",      day_init,      day_size,      day_draw,      day_run,      {KEY_F(1), '1',    } },

diff --git a/src/view.h b/src/view.h
index da63b8c8179c5e9a7f8108225600bc1cc2736c41..64e8301cf51dcdc65a5cf11e78da9da148919f21 100644 (file)
--- a/src/view.h
+++ b/src/view.h
@@ -46,43 +46,3 @@ void view_init(void);
 void view_resize(void);
 void view_draw(void);
 int  view_run(int key, mmask_t btn, int row, int col);
-
-/* View init functions */
-void day_init(WINDOW *win);
-void week_init(WINDOW *win);
-void month_init(WINDOW *win);
-void year_init(WINDOW *win);
-void events_init(WINDOW *win);
-void todo_init(WINDOW *win);
-void settings_init(WINDOW *win);
-void help_init(WINDOW *win);
-
-/* View size functions */
-void day_size(int,int);
-void week_size(int,int);
-void month_size(int,int);
-void year_size(int,int);
-void events_size(int,int);
-void todo_size(int,int);
-void settings_size(int,int);
-void help_size(int,int);
-
-/* View draw functions */
-void day_draw(void);
-void week_draw(void);
-void month_draw(void);
-void year_draw(void);
-void events_draw(void);
-void todo_draw(void);
-void settings_draw(void);
-void help_draw(void);
-
-/* View run functions */
-int day_run(int,mmask_t,int,int);
-int week_run(int,mmask_t,int,int);
-int month_run(int,mmask_t,int,int);
-int year_run(int,mmask_t,int,int);
-int events_run(int,mmask_t,int,int);
-int todo_run(int,mmask_t,int,int);
-int settings_run(int,mmask_t,int,int);
-int help_run(int,mmask_t,int,int);