This is so that you won't get warnings from mixing integer types. I have updated the input checks in log.c to check for invalid targets. Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com&gt; --- include/qb/qblog.h | 4 ++-- lib/log.c | 14 +++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/qb/qblog.h b/include/qb/qblog.h index deb8fc5..a5317b1 100644 --- a/include/qb/qblog.h +++ b/include/qb/qblog.h @@ -377,14 +377,14 @@ void qb_log_callsites_dump(void); * @retval -errno on error * @retval 0 on success */ -int32_t qb_log_ctl(uint32_t t, enum qb_log_conf c, int32_t arg); +int32_t qb_log_ctl(int32_t t, enum qb_log_conf c, int32_t arg); /** * Filter control * * This allows you define which log messages go to which target. */ -int32_t qb_log_filter_ctl(uint32_t value, enum qb_log_filter_conf c, +int32_t qb_log_filter_ctl(int32_t value, enum qb_log_filter_conf c, enum qb_log_filter_type type, const char * text, uint32_t priority); diff --git a/lib/log.c b/lib/log.c index 04cec8e..a281df2 100644 --- a/lib/log.c +++ b/lib/log.c @@ -392,12 +392,16 @@ static void _log_filter_apply(struct callsite_section *sect, } } -int32_t qb_log_filter_ctl(uint32_t t, enum qb_log_filter_conf c, +int32_t qb_log_filter_ctl(int32_t t, enum qb_log_filter_conf c, enum qb_log_filter_type type, const char *text, uint32_t priority) { struct callsite_section *sect; - int32_t rc = _log_filter_store(t, c, type, text, priority); + int32_t rc; + if (t < 0 || t >= 32) { + return -EBADFD; + } + rc = _log_filter_store(t, c, type, text, priority); if (rc < 0) { return rc; } @@ -572,13 +576,13 @@ static void _log_target_disable(struct qb_log_target *t) qb_list_del(&t->active_list); } -int32_t qb_log_ctl(uint32_t t, enum qb_log_conf c, int32_t arg) +int32_t qb_log_ctl(int32_t t, enum qb_log_conf c, int32_t arg) { int32_t rc = 0; int32_t need_reload = QB_FALSE; - if (t > 31) { - return -EINVAL; + if (t < 0 || t >= 32) { + return -EBADFD; } switch (c) { case QB_LOG_CONF_ENABLED: -- 1.7.4

Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com&gt; --- tests/bench-log.c | 38 ++++++++++++-------------------------- 1 files changed, 12 insertions(+), 26 deletions(-) diff --git a/tests/bench-log.c b/tests/bench-log.c index 9351431..80c167a 100644 --- a/tests/bench-log.c +++ b/tests/bench-log.c @@ -1,37 +1,23 @@ /* - * Copyright (c) 2008, 2009 Red Hat, Inc. + * Copyright (c) 2011 Red Hat, Inc. * * All rights reserved. * - * Author: Steven Dake (sdake(a)redhat.com) + * Author: Steven Dake <sdake(a)redhat.com&gt; * - * This software licensed under BSD license, the text of which follows: + * libqb is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 2.1 of the License, or + * (at your option) any later version. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * libqb 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 Lesser General Public License for more details. * - * - Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - Neither the name of the MontaVista Software, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. + * You should have received a copy of the GNU Lesser General Public License + * along with libqb. If not, see <http://www.gnu.org/licenses/>;. */ - #include <config.h> #include <stdio.h> -- 1.7.4