X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=6a90e55bbc17a3256f4d17fef506150e4f300d8d;hp=9fe316ed7454ed101cf2f66f2b04109f24c463dd;hb=c73d23911d78ed10179c12ef8f79a3fcf3bbcdaf;hpb=ab0e988bdbccd590a3e7ad101ae152ead4d2bfdb

diff --git a/para.h b/para.h
index 9fe316ed..6a90e55b 100644
--- a/para.h
+++ b/para.h
@@ -158,27 +158,15 @@ int tv_convex_combination(const long a, const struct timeval *tv1,
 		struct timeval *result);
 void ms2tv(const long unsigned n, struct timeval *tv);
 
-/* stat */
-enum {
-	SI_BASENAME,		SI_STATUS,		SI_NUM_PLAYED,
-	SI_MTIME,		SI_LENGTH_MIN,		SI_LENGTH_SEC,
-	SI_FILE_SIZE,		SI_STATUS_FLAGS,	SI_FORMAT,
-	SI_SCORE,		SI_AUDIO_INFO1,		SI_AUDIO_INFO2,
-	SI_AUDIO_INFO3,		SI_AFS_MODE,		SI_ATTRIBUTES,
-	SI_DIRECTORY,		SI_DECODER_FLAGS,	SI_AUDIOD_STATUS,
-	SI_PLAY_TIME,		SI_UPTIME,		SI_OFFSET,
-	SI_SECONDS_TOTAL,	SI_STREAM_START,	SI_CURRENT_TIME,
-	SI_AUDIOD_UPTIME,	SI_IMAGE_ID,		SI_LYRICS_ID,
-	SI_DURATION,
-	NUM_STAT_ITEMS
-};
-
+/** The enum of all status items. */
+enum status_items {STATUS_ITEM_ENUM NUM_STAT_ITEMS};
+extern const char *status_item_list[];
+/** Loop over each status item. */
+#define FOR_EACH_STATUS_ITEM(i) for (i = 0; i < NUM_STAT_ITEMS; i++)
 int stat_item_valid(const char *item);
 int stat_line_valid(const char *);
 void stat_client_write(const char *msg, int itemnum);
 int stat_client_add(int fd, long unsigned mask);
-/** Loop over each status item. */
-#define FOR_EACH_STAT_ITEM(i) for (i = 0; i < NUM_STAT_ITEMS; i++)
 
 __printf_2_3 void para_log(int, const char*, ...);
 
@@ -225,7 +213,22 @@ static inline long int para_random(unsigned max)
 }
 
 /** Round up x to a multiple of y */
-#define ROUND_UP(x, y) (((x) + (y - 1) / (y)) * (y))
+#define ROUND_UP(x, y) (((x) + ((y) - 1) / (y)) * (y))
 
 /** Get the size of an array */
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
+/**
+ * Wrapper for isspace.
+ * NetBSD needs this.
+ */
+/*
+ * The values should be cast to an unsigned char first, then to int.
+ * Why? Because the isdigit (as do all other is/to functions/macros)
+ * expect a number from 0 upto and including 255 as their (int) argument.
+ * Because char is signed on most systems, casting it to int immediately
+ * gives the functions an argument between -128 and 127 (inclusive),
+ * which they will use as an array index, and which will thus fail
+ * horribly for characters which have their most significant bit set.
+ */
+#define para_isspace(c) isspace((int)(unsigned char)(c))