From 488b1be59c08777a029cd126cac314d08d943922 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 16 Dec 2017 22:53:56 +0100 Subject: [PATCH] devfsctl(8): syntax_error() never returns, so change it to 'void'. While here, fix indent a bit and add a copyright to devfsctl.h. --- sbin/devfsctl/devfsctl.c | 6 +++--- sbin/devfsctl/devfsctl.h | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/sbin/devfsctl/devfsctl.c b/sbin/devfsctl/devfsctl.c index f8738e335d..6b6a7c2036 100644 --- a/sbin/devfsctl/devfsctl.c +++ b/sbin/devfsctl/devfsctl.c @@ -129,7 +129,7 @@ static const struct devtype devtypes[] = { { NULL, 0 } }; -int +void syntax_error(const char *fmt, ...) { char buf[1024]; @@ -138,8 +138,8 @@ syntax_error(const char *fmt, ...) va_start(ap, fmt); vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); - errx(1, "%s: syntax error on line %d: %s\n",file_stack[line_stack_depth], - line_stack[line_stack_depth], buf); + errx(1, "%s: syntax error on line %d: %s\n", + file_stack[line_stack_depth], line_stack[line_stack_depth], buf); } static int diff --git a/sbin/devfsctl/devfsctl.h b/sbin/devfsctl/devfsctl.h index ca3fc4f2ae..967b200340 100644 --- a/sbin/devfsctl/devfsctl.h +++ b/sbin/devfsctl/devfsctl.h @@ -1,3 +1,37 @@ +/* + * Copyright (c) 2009 The DragonFly Project. All rights reserved. + * + * This code is derived from software contributed to The DragonFly Project + * by Alex Hornung + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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. + * 3. Neither the name of The DragonFly Project 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 HOLDERS 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. + */ + #ifndef DEVFSCTL_H #define DEVFSCTL_H @@ -73,7 +107,7 @@ void add_rule(struct rule *); int rule_apply(void); void dump_config(void); int read_config(const char *, int); -int syntax_error(const char *fmt, ...) __printflike(1, 2); +void syntax_error(const char *fmt, ...) __printflike(1, 2); void rule_tab(void); void delete_rules(void); #endif -- 2.11.4.GIT