X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftarget_replace.c;h=bd8f9e5c51d443650545bc94325fe53df25233e3;hb=7bab45b57d6ef99ae55c499c51478dd63c3b1397;hp=9a9affb4d3e6ba3841f33f0be7d3d47effade175;hpb=37905c5a2370c8e6edae5011978773eeaa589d09;p=collectd.git diff --git a/src/target_replace.c b/src/target_replace.c index 9a9affb4..bd8f9e5c 100644 --- a/src/target_replace.c +++ b/src/target_replace.c @@ -1,22 +1,27 @@ /** * collectd - src/target_replace.c - * Copyright (C) 2008 Florian Forster + * Copyright (C) 2008 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 + * Florian Forster **/ #include "collectd.h" @@ -185,7 +190,7 @@ static int tr_action_invoke (tr_action_t *act_head, /* {{{ */ } subst_status = subst (temp, sizeof (temp), buffer, - matches[0].rm_so, matches[0].rm_eo, act->replacement); + (size_t) matches[0].rm_so, (size_t) matches[0].rm_eo, act->replacement); if (subst_status == NULL) { ERROR ("Target `replace': subst (buffer = %s, start = %zu, end = %zu, " @@ -296,8 +301,8 @@ static int tr_create (const oconfig_item_t *ci, void **user_data) /* {{{ */ /* && (data->type == NULL) */ && (data->type_instance == NULL)) { - ERROR ("Target `replace': You need to set at lease one of `Host', " - "`Plugin', `PluginInstance', `Type', or `TypeInstance'."); + ERROR ("Target `replace': You need to set at least one of `Host', " + "`Plugin', `PluginInstance' or `TypeInstance'."); status = -1; }