projects
/
collection4.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f61054f
)
graph_list.c: Removed unused stuff.
author
Florian Forster
<ff@octo.it>
Tue, 15 Jun 2010 09:29:31 +0000
(11:29 +0200)
committer
Florian Forster
<octo@leeloo.lan.home.verplant.org>
Tue, 15 Jun 2010 09:29:31 +0000
(11:29 +0200)
graph_list.c
patch
|
blob
|
history
diff --git
a/graph_list.c
b/graph_list.c
index
6e11894
..
83c5e68
100644
(file)
--- a/
graph_list.c
+++ b/
graph_list.c
@@
-5,7
+5,6
@@
#include <string.h>
#include <time.h>
#include <errno.h>
#include <string.h>
#include <time.h>
#include <errno.h>
-#include <assert.h>
#include "graph_list.h"
#include "graph_ident.h"
#include "graph_list.h"
#include "graph_ident.h"
@@
-23,22
+22,6
@@
*/
#define UPDATE_INTERVAL 10
*/
#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
*/
/*
* Global variables
*/
@@
-53,22
+36,6
@@
static time_t gl_last_update = 0;
/*
* Private functions
*/
/*
* 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)
{
int gl_add_graph_internal (graph_config_t *cfg, /* {{{ */
graph_config_t ***gl_array, size_t *gl_array_num)
{
@@
-296,7
+263,6
@@
int gl_instance_get_all (gl_inst_callback callback, /* {{{ */
int gl_update (void) /* {{{ */
{
time_t now;
int gl_update (void) /* {{{ */
{
time_t now;
- gl_ident_stage_t gl;
int status;
/*
int status;
/*
@@
-310,13
+276,6
@@
int gl_update (void) /* {{{ */
graph_read_config ();
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);
gl_clear_instances ();
status = fs_scan (/* callback = */ gl_register_file, /* user data = */ NULL);