X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fliboconfig%2Foconfig.c;h=d6f07446f9c604848787c184d28366db473a4cda;hb=4d370741101aeb037ae52f3529a4a0869e0dc08a;hp=bb36c5e66fc5ac8d5b65f135675cc6011b94393c;hpb=c1219a1c9db2e8400e2ee94b87f86ccd441485d5;p=collectd.git diff --git a/src/liboconfig/oconfig.c b/src/liboconfig/oconfig.c index bb36c5e6..d6f07446 100644 --- a/src/liboconfig/oconfig.c +++ b/src/liboconfig/oconfig.c @@ -1,20 +1,28 @@ /** - * oconfig - src/oconfig.c - * Copyright (C) 2006,2007 Florian octo Forster + * collectd - src/liboconfig/oconfig.c + * Copyright (C) 2006,2007 Florian 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 - * Free Software Foundation; only version 2 of the License is applicable. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Authors: + * Florian Forster + **/ #include #include @@ -35,7 +43,7 @@ static void yyset_in (FILE *fd) yyin = fd; } /* void yyset_in */ -oconfig_item_t *oconfig_parse_fh (FILE *fh) +static oconfig_item_t *oconfig_parse_fh (FILE *fh) { int status; oconfig_item_t *ret; @@ -47,7 +55,7 @@ oconfig_item_t *oconfig_parse_fh (FILE *fh) if (NULL == c_file) { status = snprintf (file, sizeof (file), "", fileno (fh)); - if ((status < 0) || (status >= sizeof (file))) { + if ((status < 0) || (((size_t) status) >= sizeof (file))) { c_file = ""; } else { @@ -98,13 +106,12 @@ oconfig_item_t *oconfig_clone (const oconfig_item_t *ci_orig) { oconfig_item_t *ci_copy; - ci_copy = (oconfig_item_t *) malloc (sizeof (*ci_copy)); + ci_copy = calloc (1, sizeof (*ci_copy)); if (ci_copy == NULL) { - fprintf (stderr, "malloc failed.\n"); + fprintf (stderr, "calloc failed.\n"); return (NULL); } - memset (ci_copy, 0, sizeof (*ci_copy)); ci_copy->values = NULL; ci_copy->parent = NULL; ci_copy->children = NULL; @@ -119,10 +126,8 @@ oconfig_item_t *oconfig_clone (const oconfig_item_t *ci_orig) if (ci_orig->values_num > 0) /* {{{ */ { - int i; - - ci_copy->values = (oconfig_value_t *) calloc (ci_orig->values_num, - sizeof (*ci_copy->values)); + ci_copy->values = (oconfig_value_t *) calloc ((size_t) ci_orig->values_num, + sizeof (*ci_copy->values)); if (ci_copy->values == NULL) { fprintf (stderr, "calloc failed.\n"); @@ -132,33 +137,30 @@ oconfig_item_t *oconfig_clone (const oconfig_item_t *ci_orig) } ci_copy->values_num = ci_orig->values_num; - for (i = 0; i < ci_copy->values_num; i++) + for (int i = 0; i < ci_copy->values_num; i++) { ci_copy->values[i].type = ci_orig->values[i].type; if (ci_copy->values[i].type == OCONFIG_TYPE_STRING) { - ci_copy->values[i].value.string - = strdup (ci_orig->values[i].value.string); - if (ci_copy->values[i].value.string == NULL) - { - fprintf (stderr, "strdup failed.\n"); - oconfig_free (ci_copy); - return (NULL); - } + ci_copy->values[i].value.string = strdup (ci_orig->values[i].value.string); + if (ci_copy->values[i].value.string == NULL) + { + fprintf (stderr, "strdup failed.\n"); + oconfig_free (ci_copy); + return (NULL); + } } else /* ci_copy->values[i].type != OCONFIG_TYPE_STRING) */ { - ci_copy->values[i].value = ci_orig->values[i].value; + ci_copy->values[i].value = ci_orig->values[i].value; } } } /* }}} if (ci_orig->values_num > 0) */ if (ci_orig->children_num > 0) /* {{{ */ { - int i; - - ci_copy->children = (oconfig_item_t *) calloc (ci_orig->children_num, - sizeof (*ci_copy->children)); + ci_copy->children = (oconfig_item_t *) calloc ((size_t) ci_orig->children_num, + sizeof (*ci_copy->children)); if (ci_copy->children == NULL) { fprintf (stderr, "calloc failed.\n"); @@ -167,10 +169,10 @@ oconfig_item_t *oconfig_clone (const oconfig_item_t *ci_orig) } ci_copy->children_num = ci_orig->children_num; - for (i = 0; i < ci_copy->children_num; i++) + for (int i = 0; i < ci_copy->children_num; i++) { oconfig_item_t *child; - + child = oconfig_clone (ci_orig->children + i); if (child == NULL) { @@ -188,15 +190,13 @@ oconfig_item_t *oconfig_clone (const oconfig_item_t *ci_orig) static void oconfig_free_all (oconfig_item_t *ci) { - int i; - if (ci == NULL) return; if (ci->key != NULL) free (ci->key); - for (i = 0; i < ci->values_num; i++) + for (int i = 0; i < ci->values_num; i++) if ((ci->values[i].type == OCONFIG_TYPE_STRING) && (NULL != ci->values[i].value.string)) free (ci->values[i].value.string); @@ -204,7 +204,7 @@ static void oconfig_free_all (oconfig_item_t *ci) if (ci->values != NULL) free (ci->values); - for (i = 0; i < ci->children_num; i++) + for (int i = 0; i < ci->children_num; i++) oconfig_free_all (ci->children + i); if (ci->children != NULL) @@ -215,7 +215,6 @@ void oconfig_free (oconfig_item_t *ci) { oconfig_free_all (ci); free (ci); - ci = NULL; } /*