X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=687ad30ef5507ce4ac7221060bda486d1dc97d57;hp=112d5fef0d1daef2f9d32f39c56e2c38442c0d27;hb=957daedc7a0f238a9d3b34ff4a3c84d5ed3851ec;hpb=a18295788a381a5083e42fde7d7615b328bb6509 diff --git a/para.h b/para.h index 112d5fef..687ad30e 100644 --- a/para.h +++ b/para.h @@ -131,8 +131,9 @@ va_end(argp); \ } -/** version text used by various commands if -V switch was given */ -#define VERSION_TEXT(prefix) "para_" prefix " " PACKAGE_VERSION " (" CODENAME ")" "\n" \ +/** Version text used by various commands if -V switch was given. */ +#define VERSION_TEXT(prefix) "para_" prefix " " PACKAGE_VERSION \ + " (" GIT_VERSION ": " CODENAME ")" "\n" \ "Copyright (C) 2009 Andre Noll\n" \ "This is free software with ABSOLUTELY NO WARRANTY." \ " See COPYING for details.\n" \ @@ -181,10 +182,8 @@ 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); +int for_each_stat_item(char *item_buf, size_t num_bytes, + int (*item_handler)(int, char *)); __printf_2_3 void para_log(int, const char*, ...); @@ -256,3 +255,7 @@ _static_inline_ long int para_random(unsigned max) #define FEC_EOF_PACKET "\xec\x0d\xcc\xfe\0\0\0\0" \ "\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0" #define FEC_EOF_PACKET_LEN 32 + +/** Used to avoid a shortcoming in vim's syntax highlighting. */ +#define EMBRACE(...) { __VA_ARGS__} +