X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=687ad30ef5507ce4ac7221060bda486d1dc97d57;hp=66cf9e48d2fa7fb5e5df56ece15ef30df89427a2;hb=11ef83c4abb2ccbdf3f99a8adf98749b2b0656c2;hpb=6f5030f4b257aba7ea4265ef3ae35d96477bbfc3 diff --git a/para.h b/para.h index 66cf9e48..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,12 +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); -void stat_client_write_item(int item_num); -int stat_client_add(int fd, uint64_t mask, int parser_friendly); int for_each_stat_item(char *item_buf, size_t num_bytes, int (*item_handler)(int, char *)); -void clear_and_dump_items(void); __printf_2_3 void para_log(int, const char*, ...); @@ -258,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__} +