#include <string.h>
#include <time.h>
#include <errno.h>
-#include <assert.h>
#include "graph_list.h"
#include "graph_ident.h"
*/
#define UPDATE_INTERVAL 10
-#define ANY_TOKEN "/any/"
-#define ALL_TOKEN "/all/"
-
-/*
- * Data types
- */
-struct gl_ident_stage_s /* {{{ */
-{
- char *host;
- char *plugin;
- char *plugin_instance;
- char *type;
- char *type_instance;
-}; /* }}} */
-typedef struct gl_ident_stage_s gl_ident_stage_t;
-
/*
* Global variables
*/
/*
* Private functions
*/
-#if 0
-/* "Safe" version of strcmp(3): Either or both pointers may be NULL. */
-static int strcmp_s (const char *s1, const char *s2) /* {{{ */
-{
- if ((s1 == NULL) && (s2 == NULL))
- return (0);
- else if (s1 == NULL)
- return (1);
- else if (s2 == NULL)
- return (-1);
- assert ((s1 != NULL) && (s2 != NULL));
-
- return (strcmp (s1, s2));
-} /* }}} int strcmp_s */
-#endif
-
int gl_add_graph_internal (graph_config_t *cfg, /* {{{ */
graph_config_t ***gl_array, size_t *gl_array_num)
{
return (gl_add_graph_internal (cfg, &gl_staging, &gl_staging_num));
} /* }}} int gl_add_graph */
-int graph_config_submit (void) /* {{{ */
+int gl_config_submit (void) /* {{{ */
{
graph_config_t **old;
size_t old_num;
return (0);
} /* }}} int gl_graph_get_all */
-graph_config_t *graph_get_selected (void) /* {{{ */
+graph_config_t *gl_graph_get_selected (void) /* {{{ */
{
const char *host = get_part_from_param ("graph_host", "host");
const char *plugin = get_part_from_param ("graph_plugin", "plugin");
ident_destroy (ident);
return (NULL);
-} /* }}} graph_config_t *graph_get_selected */
+} /* }}} graph_config_t *gl_graph_get_selected */
/* gl_instance_get_all, gl_graph_instance_get_all {{{ */
struct gl_inst_callback_data /* {{{ */
if ((cfg == NULL) || (callback == NULL))
return (EINVAL);
- return (inst_foreach (gl_graph_get_instances (cfg),
+ return (inst_foreach (graph_get_instances (cfg),
gl_inst_callback_handler, &data));
} /* }}} int gl_graph_instance_get_all */
int gl_update (void) /* {{{ */
{
time_t now;
- gl_ident_stage_t gl;
int status;
/*
graph_read_config ();
- memset (&gl, 0, sizeof (gl));
- gl.host = NULL;
- gl.plugin = NULL;
- gl.plugin_instance = NULL;
- gl.type = NULL;
- gl.type_instance = NULL;
-
gl_clear_instances ();
status = fs_scan (/* callback = */ gl_register_file, /* user data = */ NULL);