[Initng-svn] r2387 - in initng: devtool plugins/dparser
plugins/iparser plugins/rlparser src
svn at initng.thinktux.net
svn at initng.thinktux.net
Mon Dec 12 12:46:56 CET 2005
Author: jimmy
Date: Mon Dec 12 12:46:55 2005
New Revision: 2387
Modified:
initng/devtool/test_parser.c
initng/plugins/dparser/initng_d_parser.c
initng/plugins/iparser/initng_i_parser.c
initng/plugins/rlparser/initng_rl_parser.c
initng/plugins/rlparser/initng_rl_parser.h
initng/src/initng_service_cache.c
initng/src/initng_service_cache.h
Log:
Some more cleanup.
Modified: initng/devtool/test_parser.c
==============================================================================
--- initng/devtool/test_parser.c (original)
+++ initng/devtool/test_parser.c Mon Dec 12 12:46:55 2005
@@ -69,9 +69,9 @@
#define OK 1
#define CHECKED 2
-static int load_service(char *name, int level);
+static int load_service(const char *name, int level);
static int parse_all(const char *dirname);
-static int check_deps(char **dep_list, char *dep, int level);
+static int check_deps(const char **dep_list, const char *dep, int level);
static int verbose = 0;
static int print_each = 0;
@@ -276,11 +276,11 @@
return result;
}
-static int load_service(char *name, int level)
+static int load_service(const char *name, int level)
{
service_h *service = NULL;
service_h *tmp_service = NULL;
- char *string = NULL;
+ const char *string = NULL;
int result = NOT_OK;
int srv_status;
int i;
@@ -346,13 +346,13 @@
return result;
}
-static int check_deps(char **dep_list, char *dep, int level)
+static int check_deps(const char **dep_list, const char *dep, int level)
{
int result = NOT_OK;
int tmp_result;
int status;
- char **my_list;
- char *string = NULL;
+ const char **my_list;
+ const char *string = NULL;
int i, j;
service_h *service = service_db_find_by_name(dep);
@@ -375,7 +375,7 @@
result = OK;
- my_list = (char **) initng_calloc(level + 2, sizeof(char *));
+ my_list = (const char **) initng_calloc(level + 2, sizeof(char *));
my_list[level + 1] = NULL;
while ((string = service_db_get_next_string(&NEED, service, string)))
Modified: initng/plugins/dparser/initng_d_parser.c
==============================================================================
--- initng/plugins/dparser/initng_d_parser.c (original)
+++ initng/plugins/dparser/initng_d_parser.c Mon Dec 12 12:46:55 2005
@@ -208,7 +208,7 @@
}
D_("Did read the complete file!\n");
- serv = service_db_new(i_strdup(s_name), &TYPE_SERVICE);
+ serv = service_db_new(s_name, &TYPE_SERVICE);
if (!serv)
{
D_("Cant allocate service\n");
Modified: initng/plugins/iparser/initng_i_parser.c
==============================================================================
--- initng/plugins/iparser/initng_i_parser.c (original)
+++ initng/plugins/iparser/initng_i_parser.c Mon Dec 12 12:46:55 2005
@@ -505,6 +505,8 @@
/* | */
new_service = service_db_new(name, type);
+ free(name);
+ name=NULL;
/* FROM NOW, we should not free name or father_name, becouse its ADDED, and required */
@@ -514,7 +516,6 @@
F_("Unable to allocate space for new service.\n");
err_print_line(*to_parse,
"Unable to allocate space for new service.");
- free(name);
if (father_name)
free(father_name);
return (FALSE);
Modified: initng/plugins/rlparser/initng_rl_parser.c
==============================================================================
--- initng/plugins/rlparser/initng_rl_parser.c (original)
+++ initng/plugins/rlparser/initng_rl_parser.c Mon Dec 12 12:46:55 2005
@@ -41,11 +41,10 @@
#include "initng_rl_parser.h"
/* a simple parser for a runlevel file */
-service_h *initng_rl_parser(char *runlevel_name)
+service_h *initng_rl_parser(const char *runlevel_name)
{
service_h *n_service; /* service struct pointer too */
char *filetoparse = NULL;
- char *name = NULL;
char *w_depends = NULL;
char *w = NULL;
char *a = NULL;
@@ -56,8 +55,6 @@
strlen(runlevel_name) + 10,
sizeof(char));
- name = i_strdup(runlevel_name);
-
D_("initng_rl_parser(%s);\n", runlevel_name);
strcpy(filetoparse, INITNG_ROOT "/");
strcat(filetoparse, runlevel_name);
@@ -66,9 +63,8 @@
runlevel_name, filetoparse);
/* allocate a new service */
- if (!(n_service = service_db_new(name, &TYPE_RUNLEVEL)))
+ if (!(n_service = service_db_new(runlevel_name, &TYPE_RUNLEVEL)))
{
- free(name);
free(filetoparse);
return (NULL);
}
Modified: initng/plugins/rlparser/initng_rl_parser.h
==============================================================================
--- initng/plugins/rlparser/initng_rl_parser.h (original)
+++ initng/plugins/rlparser/initng_rl_parser.h Mon Dec 12 12:46:55 2005
@@ -26,6 +26,6 @@
int module_init(const char *version);
void module_unload(void);
-service_h *initng_rl_parser(char *runlevel_name);
+service_h *initng_rl_parser(const char *runlevel_name);
#endif
Modified: initng/src/initng_service_cache.c
==============================================================================
--- initng/src/initng_service_cache.c (original)
+++ initng/src/initng_service_cache.c Mon Dec 12 12:46:55 2005
@@ -108,7 +108,7 @@
* Allocates an entry, in memory, and sets defaults,
* name & type, initziate lits.
*/
-service_h *service_db_new(char *name, stype_h * type)
+service_h *service_db_new(const char *name, stype_h * type)
{
service_h *new_s = NULL;
@@ -121,7 +121,7 @@
}
/* set name & type */
- new_s->name = name;
+ new_s->name = i_strdup(name);
new_s->type = type;
/* initziate the data list struct */
Modified: initng/src/initng_service_cache.h
==============================================================================
--- initng/src/initng_service_cache.h (original)
+++ initng/src/initng_service_cache.h Mon Dec 12 12:46:55 2005
@@ -56,7 +56,7 @@
/* service haneling functions */
int service_db_add(service_h * s);
service_h *service_db_copy(char *name, service_h * s);
-service_h *service_db_new(char *name, stype_h * type);
+service_h *service_db_new(const char *name, stype_h * type);
/* Searching */
service_h *service_db_find_by_exact_name(const char *service);
More information about the Initng-svn
mailing list