Some organization

[lackey] / src / util.h

diff --git a/src/util.h b/src/util.h
index 9b2755162379e9e3160c5d554c6b6ba50295e039..98fb33285a8b40c242703b93843c5e3d52329c93 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -15,65 +15,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UTIL_H
-#define UTIL_H
-
 /* Macros */
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #define ROUND(x) ((int)((x)+0.5))
 #define N_ELEMENTS(x) (sizeof(x)/sizeof((x)[0]))
 
-/* Time types */
-typedef int year_t;
-typedef int day_t;
-typedef int hour_t;
-typedef int min_t;
-
-typedef enum {
-       JAN =  0,
-       FEB =  1,
-       MAR =  2,
-       APR =  3,
-       MAY =  4,
-       JUN =  5,
-       JUL =  6,
-       AUG =  7,
-       SEP =  8,
-       OCT =  9,
-       NOV = 10,
-       DEC = 11,
-} month_t;
-
-typedef enum {
-       SUN = 0,
-       MON = 1,
-       TUE = 2,
-       WED = 3,
-       THU = 4,
-       FRI = 5,
-       SAT = 6,
-} wday_t;
-
-/* Time functions */
-int is_leap_year(year_t year);
-int days_in_year(year_t year);
-int days_in_month(year_t year, month_t month);
-int weeks_in_month(year_t year, month_t month);
-wday_t day_of_week(year_t year, month_t month, day_t day);
-wday_t start_of_month(year_t year, month_t month);
-day_t start_of_week(year_t year, month_t month, day_t day);
-void add_days(year_t *year, month_t *month, day_t *day, int days);
-void add_months(year_t *year, month_t *month, int months);
-
-/* Time to string functions */
-const char *month_to_str(month_t month);
-const char *month_to_string(month_t month);
-const char *day_to_st(wday_t day);
-const char *day_to_str(wday_t day);
-const char *day_to_string(wday_t day);
-
-/* Tests */
-void test_time(void);
+/* Debug functions */
+void util_init(void);
 
+/* Debug functions */
+#ifdef DEBUG
+int debug(char *fmt, ...);
+#else
+#define debug(...)
 #endif