X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcommon.h;h=019e8b69f9817e673df2b7f3f673401d91e7579f;hb=fefa5f361dff8d9c6e9e6f3ab11463f5d058a6cb;hp=d0cc4e829b59a2bf895248ac8bf7664b727e655e;hpb=330010ea9cf8dad458dc9245d8284a7dbf62b1a9;p=collectd.git diff --git a/src/common.h b/src/common.h index d0cc4e82..019e8b69 100644 --- a/src/common.h +++ b/src/common.h @@ -1,6 +1,6 @@ /** * collectd - src/common.h - * Copyright (C) 2005-2008 Florian octo Forster + * Copyright (C) 2005-2009 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 @@ -253,14 +253,14 @@ int format_name (char *ret, int ret_len, const char *hostname, const char *plugin, const char *plugin_instance, const char *type, const char *type_instance); -#define FORMAT_VL(ret, ret_len, vl, ds) \ +#define FORMAT_VL(ret, ret_len, vl) \ format_name (ret, ret_len, (vl)->host, (vl)->plugin, (vl)->plugin_instance, \ - (ds)->type, (vl)->type_instance) + (vl)->type, (vl)->type_instance) int parse_identifier (char *str, char **ret_host, char **ret_plugin, char **ret_plugin_instance, char **ret_type, char **ret_type_instance); -int parse_value (const char *value, value_t *ret_value, const data_source_t ds); +int parse_value (const char *value, value_t *ret_value, int ds_type); int parse_values (char *buffer, value_list_t *vl, const data_set_t *ds); #if !HAVE_GETPWNAM_R @@ -285,4 +285,8 @@ int read_file_contents (const char *filename, char *buf, int bufsize); counter_t counter_diff (counter_t old_value, counter_t new_value); +/* Converts a service name (a string) to a port number + * (in the range [1-65535]). Returns less than zero on error. */ +int service_name_to_port_number (const char *service_name); + #endif /* COMMON_H */