X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcommon.h;h=8e0d8404b5b1cf6c660fb641c4377d4b53584943;hb=6e855e6ab3bc654a3d6238c75102c66785de8bda;hp=f12b5e4d73b659503e3f7d959e4e1fd4cbba1a3d;hpb=d6bb65ee60f5ea992b0701b98037cfeb3fd3e4e3;p=collectd.git diff --git a/src/common.h b/src/common.h index f12b5e4d..8e0d8404 100644 --- a/src/common.h +++ b/src/common.h @@ -1,6 +1,6 @@ /** * collectd - src/common.h - * Copyright (C) 2005-2007 Florian octo Forster + * Copyright (C) 2005-2008 Florian octo Forster * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -48,17 +48,17 @@ char *sstrerror (int errnum, char *buf, size_t buflen); * sread * * DESCRIPTION - * Reads exactly `n' bytes or failes. Syntax and other behavior is analogous + * Reads exactly `n' bytes or fails. Syntax and other behavior is analogous * to `read(2)'. If EOF is received the file descriptor is closed and an * error is returned. * * PARAMETERS * `fd' File descriptor to write to. * `buf' Buffer that is to be written. - * `count' Numver of bytes in the buffer. + * `count' Number of bytes in the buffer. * * RETURN VALUE - * Zero upon success or non-zero if an error occured. `errno' is set in this + * Zero upon success or non-zero if an error occurred. `errno' is set in this * case. */ ssize_t sread (int fd, void *buf, size_t count); @@ -68,16 +68,16 @@ ssize_t sread (int fd, void *buf, size_t count); * swrite * * DESCRIPTION - * Writes exactly `n' bytes or failes. Syntax and other behavior is analogous + * Writes exactly `n' bytes or fails. Syntax and other behavior is analogous * to `write(2)'. * * PARAMETERS * `fd' File descriptor to write to. * `buf' Buffer that is to be written. - * `count' Numver of bytes in the buffer. + * `count' Number of bytes in the buffer. * * RETURN VALUE - * Zero upon success or non-zero if an error occured. `errno' is set in this + * Zero upon success or non-zero if an error occurred. `errno' is set in this * case. */ ssize_t swrite (int fd, const void *buf, size_t count); @@ -108,8 +108,8 @@ int strsplit (char *string, char **fields, size_t size); * strjoin * * DESCRIPTION - * Joins together several parts of a string using `sep' as a seperator. This - * is equipollent to the perl buildin `join'. + * Joins together several parts of a string using `sep' as a separator. This + * is equivalent to the Perl built-in `join'. * * PARAMETERS * `dst' Buffer where the result is stored. @@ -124,7 +124,7 @@ int strsplit (char *string, char **fields, size_t size); * * RETURN VALUE * Returns the number of characters in `dst', NOT including the trailing - * null-byte. If an error occured (empty array or `dst' too small) a value + * null-byte. If an error occurred (empty array or `dst' too small) a value * smaller than zero will be returned. */ int strjoin (char *dst, size_t dst_len, char **fields, size_t fields_num, const char *sep); @@ -163,6 +163,16 @@ long long get_kstat_value (kstat_t *ksp, char *name); unsigned long long ntohll (unsigned long long n); unsigned long long htonll (unsigned long long n); +#if FP_LAYOUT_NEED_NOTHING +# define ntohd(d) (d) +# define htond(d) (d) +#elif FP_LAYOUT_NEED_ENDIANFLIP || FP_LAYOUT_NEED_INTSWAP +double ntohd (double d); +double htond (double d); +#else +# error "Don't know how to convert between host and network representation of doubles." +#endif + int format_name (char *ret, int ret_len, const char *hostname, const char *plugin, const char *plugin_instance, @@ -181,4 +191,12 @@ int getpwnam_r (const char *name, struct passwd *pwbuf, char *buf, size_t buflen, struct passwd **pwbufp); #endif +int notification_init (notification_t *n, int severity, const char *message, + const char *host, + const char *plugin, const char *plugin_instance, + const char *type, const char *type_instance); +#define NOTIFICATION_INIT_VL(n, vl, ds) \ + notification_init (n, NOTIF_FAILURE, NULL, \ + (vl)->host, (vl)->plugin, (vl)->plugin_instance, \ + (ds)->type, (vl)->type_instance) #endif /* COMMON_H */