diff options
author | Inaky Perez-Gonzalez <inaky.perez-gonzalez> | 2008-12-05 10:39:14 -0800 |
---|---|---|
committer | Inaky Perez-Gonzalez <inaky@linux.intel.com> | 2008-12-05 10:39:14 -0800 |
commit | a116248a6e723fc3675c44919426f86fdda4e7af (patch) | |
tree | 04f1acf9b818bf1a78e621ddfba38517657e21e5 | |
parent | b19c9034433b43a425b66f3c39feb681da2f2d95 (diff) |
checkpatch: fix complaints
-rw-r--r-- | aclocal.m4 | 8 | ||||
-rw-r--r-- | bin/Makefile.in | 6 | ||||
-rw-r--r-- | lib/Makefile.in | 6 | ||||
-rw-r--r-- | lib/genl.c | 32 | ||||
-rw-r--r-- | lib/internal.h | 4 | ||||
-rw-r--r-- | lib/mc_rx.c | 2 | ||||
-rw-r--r-- | lib/op-open.c | 2 | ||||
-rw-r--r-- | ltmain.sh | 14 | ||||
-rw-r--r-- | src/Makefile.in | 4 |
9 files changed, 39 insertions, 39 deletions
@@ -1522,7 +1522,7 @@ darwin* | rhapsody*) shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -6672,7 +6672,7 @@ AC_MSG_RESULT([$SED]) ]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# +# # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. # # This program is free software; you can redistribute it and/or modify @@ -6712,7 +6712,7 @@ if test -n "$PKG_CONFIG"; then AC_MSG_RESULT([no]) PKG_CONFIG="" fi - + fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -6793,7 +6793,7 @@ if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` fi # Put the nasty error message in config.log where it belongs diff --git a/bin/Makefile.in b/bin/Makefile.in index 071e717..28d613e 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -271,13 +271,13 @@ clean-binPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done -wimaxll-reset$(EXEEXT): $(wimaxll_reset_OBJECTS) $(wimaxll_reset_DEPENDENCIES) +wimaxll-reset$(EXEEXT): $(wimaxll_reset_OBJECTS) $(wimaxll_reset_DEPENDENCIES) @rm -f wimaxll-reset$(EXEEXT) $(LINK) $(wimaxll_reset_OBJECTS) $(wimaxll_reset_LDADD) $(LIBS) -wimaxll-rfkill$(EXEEXT): $(wimaxll_rfkill_OBJECTS) $(wimaxll_rfkill_DEPENDENCIES) +wimaxll-rfkill$(EXEEXT): $(wimaxll_rfkill_OBJECTS) $(wimaxll_rfkill_DEPENDENCIES) @rm -f wimaxll-rfkill$(EXEEXT) $(LINK) $(wimaxll_rfkill_OBJECTS) $(wimaxll_rfkill_LDADD) $(LIBS) -wimaxll-wait-for-state-change$(EXEEXT): $(wimaxll_wait_for_state_change_OBJECTS) $(wimaxll_wait_for_state_change_DEPENDENCIES) +wimaxll-wait-for-state-change$(EXEEXT): $(wimaxll_wait_for_state_change_OBJECTS) $(wimaxll_wait_for_state_change_DEPENDENCIES) @rm -f wimaxll-wait-for-state-change$(EXEEXT) $(LINK) $(wimaxll_wait_for_state_change_OBJECTS) $(wimaxll_wait_for_state_change_LDADD) $(LIBS) install-binSCRIPTS: $(bin_SCRIPTS) diff --git a/lib/Makefile.in b/lib/Makefile.in index 603c762..2bc46dc 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -278,7 +278,7 @@ config.h: stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status lib/config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) rm -f stamp-h1 touch $@ @@ -314,7 +314,7 @@ uninstall-libLIBRARIES: clean-libLIBRARIES: -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES) -libwimaxll.a: $(libwimaxll_a_OBJECTS) $(libwimaxll_a_DEPENDENCIES) +libwimaxll.a: $(libwimaxll_a_OBJECTS) $(libwimaxll_a_DEPENDENCIES) -rm -f libwimaxll.a $(libwimaxll_a_AR) libwimaxll.a $(libwimaxll_a_OBJECTS) $(libwimaxll_a_LIBADD) $(RANLIB) libwimaxll.a @@ -345,7 +345,7 @@ clean-libLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libwimaxll.la: $(libwimaxll_la_OBJECTS) $(libwimaxll_la_DEPENDENCIES) +libwimaxll.la: $(libwimaxll_la_OBJECTS) $(libwimaxll_la_DEPENDENCIES) $(libwimaxll_la_LINK) -rpath $(libdir) $(libwimaxll_la_OBJECTS) $(libwimaxll_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -2,37 +2,37 @@ * Heavily based on code from iw-0.9.6 by Johannes berg * * -- Original license & header -- - * + * * Copyright (c) 2007, 2008 Johannes Berg * Copyright (c) 2007 Andy Lutomirski * Copyright (c) 2007 Mike Kershaw * Copyright (c) 2008 Luis R. Rodriguez - * + * * All rights reserved. - * + * * 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. + * 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. The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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. + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR 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, + * 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. - * + * * This ought to be provided by libnl * * -- End of original license & header -- @@ -41,7 +41,7 @@ #include <asm/errno.h> #include <netlink/genl/genl.h> #include <netlink/genl/family.h> -#include <netlink/genl/ctrl.h> +#include <netlink/genl/ctrl.h> #include <netlink/msg.h> #include <netlink/attr.h> #include "internal.h" @@ -83,12 +83,12 @@ static int family_handler(struct nl_msg *msg, void *_arg) nla_parse(tb, CTRL_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL); - if (!tb[CTRL_ATTR_MCAST_GROUPS]) + if (!tb[CTRL_ATTR_MCAST_GROUPS]) return NL_SKIP; nla_for_each_nested(mcgrp, tb[CTRL_ATTR_MCAST_GROUPS], rem_mcgrp) { struct nlattr *tb_mcgrp[CTRL_ATTR_MCAST_GRP_MAX + 1]; - + nla_parse(tb_mcgrp, CTRL_ATTR_MCAST_GRP_MAX, nla_data(mcgrp), nla_len(mcgrp), NULL); @@ -98,7 +98,7 @@ static int family_handler(struct nl_msg *msg, void *_arg) arg->cb(arg->priv, nla_data(tb_mcgrp[CTRL_ATTR_MCAST_GRP_NAME]), nla_get_u32(tb_mcgrp[CTRL_ATTR_MCAST_GRP_ID])); - } + } return NL_OK; } @@ -109,9 +109,9 @@ static int family_handler(struct nl_msg *msg, void *_arg) * @family: name of family to query for multicast groups * @cb: callback function to call with each multicast group's information. * @priv: pointer to pass to the callback function - * + * * Returns: 0 if ok, < 0 errno code on error. - * + * * Enumerates the multicast groups available for a generic netlink * family and calls the callback with the arguments of each. */ @@ -127,7 +127,7 @@ int nl_get_multicast_groups(struct nl_handle *handle, .priv = priv, .cb = cbf }; - + msg = nlmsg_alloc(); if (!msg) return -ENOMEM; @@ -140,7 +140,7 @@ int nl_get_multicast_groups(struct nl_handle *handle, ctrlid = genl_ctrl_resolve(handle, "nlctrl"); - genlmsg_put(msg, 0, 0, ctrlid, 0, + genlmsg_put(msg, 0, 0, ctrlid, 0, 0, CTRL_CMD_GETFAMILY, 0); ret = -ENOBUFS; diff --git a/lib/internal.h b/lib/internal.h index 23aa984..03bfdce 100644 --- a/lib/internal.h +++ b/lib/internal.h @@ -86,7 +86,7 @@ struct wimaxll_mc_group { * * FIXME: this needs some rewriting * - * \param ifidx Interface Index + * \param ifidx Interface Index * \param nlh_tx handle for writing to the kernel. * Internal note: You \b have \b to set the handlers for * %NL_CB_VALID and nl_cb_err() callbacks, as each callsite will @@ -139,7 +139,7 @@ struct wimaxll_mc_handle { struct nl_cb *nl_cb; ssize_t result; unsigned msg_done:1; /* internal */ - + wimaxll_msg_to_user_cb_f msg_to_user_cb; struct wimaxll_gnl_cb_context *msg_to_user_context; diff --git a/lib/mc_rx.c b/lib/mc_rx.c index 5dc944a..42f13a6 100644 --- a/lib/mc_rx.c +++ b/lib/mc_rx.c @@ -507,7 +507,7 @@ ssize_t wimaxll_mc_rx_read(struct wimaxll_handle *wmx, unsigned index) * * Now, messages from the kernel don't carry ACKs or NLERRs, * so we are just receiving a message packet all the - * time--except if things go wrong. + * time--except if things go wrong. */ mch->result = -EINPROGRESS; mch->msg_done = 0; diff --git a/lib/op-open.c b/lib/op-open.c index 54a10e7..360cd16 100644 --- a/lib/op-open.c +++ b/lib/op-open.c @@ -99,7 +99,7 @@ int wimaxll_gnl_resolve(struct wimaxll_handle *wmx) int result, version; char buf[64]; unsigned major, minor; - + d_fnstart(5, wmx, "(wmx %p)\n", wmx); /* Lookup the generic netlink family */ wmx->ifidx = if_nametoindex(wmx->name); @@ -382,7 +382,7 @@ func_extract_archives () darwin_curdir=`pwd` darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` - if test -n "$darwin_arches"; then + if test -n "$darwin_arches"; then darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` darwin_arch= $show "$darwin_base_archive has multiple architectures $darwin_arches" @@ -580,7 +580,7 @@ if test -n "$prevopt"; then fi case $disable_libs in -no) +no) ;; shared) build_libtool_libs=no @@ -751,7 +751,7 @@ if test -z "$show_help"; then # Many Bourne shells cannot handle close brackets correctly # in scan sets, and some SunOS ksh mistreat backslash-escaping # in scan sets (worked around with variable expansion), - # and furthermore cannot handle '|' '&' '(' ')' in scan sets + # and furthermore cannot handle '|' '&' '(' ')' in scan sets # at all, so we specify them separately. *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") lastarg="\"$lastarg\"" @@ -1531,7 +1531,7 @@ EOF -framework|-arch|-isysroot) case " $CC " in - *" ${arg} ${1} "* | *" ${arg} ${1} "*) + *" ${arg} ${1} "* | *" ${arg} ${1} "*) prev=darwin_framework_skip ;; *) compiler_flags="$compiler_flags $arg" prev=darwin_framework ;; @@ -4070,7 +4070,7 @@ EOF libobjs="$libobjs $func_extract_archives_result" fi fi - + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" linker_flags="$linker_flags $flag" @@ -5861,7 +5861,7 @@ relink_command=\"$relink_command\"" case $arg in -d) isdir=yes ;; - -f) + -f) case " $install_prog " in *[\\\ /]cp\ *) ;; *) prev=$arg ;; @@ -6254,7 +6254,7 @@ relink_command=\"$relink_command\"" fi # remove .exe since cygwin /usr/bin/install will append another - # one anyway + # one anyway case $install_prog,$host in */usr/bin/install*,*cygwin*) case $file:$destfile in diff --git a/src/Makefile.in b/src/Makefile.in index a5de712..15c8365 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -229,10 +229,10 @@ clean-noinstPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done -test-dump-pipe$(EXEEXT): $(test_dump_pipe_OBJECTS) $(test_dump_pipe_DEPENDENCIES) +test-dump-pipe$(EXEEXT): $(test_dump_pipe_OBJECTS) $(test_dump_pipe_DEPENDENCIES) @rm -f test-dump-pipe$(EXEEXT) $(LINK) $(test_dump_pipe_OBJECTS) $(test_dump_pipe_LDADD) $(LIBS) -test-rfkill$(EXEEXT): $(test_rfkill_OBJECTS) $(test_rfkill_DEPENDENCIES) +test-rfkill$(EXEEXT): $(test_rfkill_OBJECTS) $(test_rfkill_DEPENDENCIES) @rm -f test-rfkill$(EXEEXT) $(LINK) $(test_rfkill_OBJECTS) $(test_rfkill_LDADD) $(LIBS) |