From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by befuddled.reisers.ca (Postfix, from userid 65534) id E11AD1EF73E; Fri, 5 Sep 2014 14:34:26 -0400 (EDT) Received: from mail-wg0-x22f.google.com (mail-wg0-x22f.google.com [IPv6:2a00:1450:400c:c00::22f]) by befuddled.reisers.ca (Postfix) with ESMTPS id E0B2A1EF739 for ; Fri, 5 Sep 2014 14:34:24 -0400 (EDT) Received: by mail-wg0-f47.google.com with SMTP id z12so11961083wgg.6 for ; Fri, 05 Sep 2014 11:34:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=N+Gbje9u2MosKkOs6bBCyQ2UUIK2n70e6OKL7LfGcik=; b=I3uQmaTpjKlnljW4lpaT0xoO9Acva8EewCPWfGihb4mEYG3eI5DvN25Z3EA+lsAipL Nur1eEAuVFtJBwxAVo/GPHmXGzhfyVPus9bMCu1MBf4r207ET79guwMlFrV9HlbUS2VM FdosFNFCMNXGthK94Ni8aWsgdtopqjtN5MD+/+7hf8bBDQMV+DcdTRad4RQ2yRNXZvA8 /5KMYTE6sBTCmek4PA85TqkX3ZJ3JRta20/6PKRiZUoTJJ4HWcpvDl6ABLKBG448mzwl P+07ZifnUcqdPvn+O/PyX7ckalPsx8COU/2M0E13fmn8zUqgmJ8qYHz1z8iJXGqxJ+IW fzuQ== X-Received: by 10.180.73.139 with SMTP id l11mr5636234wiv.30.1409942060823; Fri, 05 Sep 2014 11:34:20 -0700 (PDT) Received: from havoc.local (cpe-188-129-50-222.dynamic.amis.hr. [188.129.50.222]) by mx.google.com with ESMTPSA id u5sm2778368wia.17.2014.09.05.11.34.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Sep 2014 11:34:19 -0700 (PDT) Date: Fri, 5 Sep 2014 20:34:20 +0200 From: Domagoj =?utf-8?B?VHLFoWFu?= To: speakup@linux-speakup.org Subject: Re: [PATCH] staging: speakup: fix coding style issues Message-ID: <20140905183419.GA92967@havoc.local> References: <1409899943-10499-1-git-send-email-domagoj.trsan@gmail.com> <20140905142200.GV13315@type.bordeaux.inria.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140905142200.GV13315@type.bordeaux.inria.fr> User-Agent: Mutt/1.5.21 (2010-09-15) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 X-BeenThere: speakup@linux-speakup.org X-Mailman-Version: 2.1.16 Precedence: list Reply-To: "Speakup is a screen review system for Linux." List-Id: "Speakup is a screen review system for Linux." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2014 18:34:27 -0000 Hi Samuel, On Sep 05 [16:22], Samuel Thibault wrote: > > Please also post the result of git diff -w -B, so we can easily check > the actual code changes, if any. > > Samuel I'm not sure if I should post "git diff -w -B" details together with the patch or as separate email. I don't know what is the preferred. I cannot reply this to the patch because the patch still awaits moderator approval (it reached the size limit of 15kB). Here is the git diff output of the fixed patch. $ git diff -w -B --ignore-blank-lines diff --git a/drivers/staging/speakup/buffers.c b/drivers/staging/speakup/buffers.c index 382973e..d45c8af 100644 --- a/drivers/staging/speakup/buffers.c +++ b/drivers/staging/speakup/buffers.c @@ -101,6 +101,5 @@ EXPORT_SYMBOL_GPL(synth_buffer_peek); void synth_buffer_clear(void) { buff_in = buff_out = synth_buffer; - return; } EXPORT_SYMBOL_GPL(synth_buffer_clear); diff --git a/drivers/staging/speakup/i18n.h b/drivers/staging/speakup/i18n.h index dd338f4..16a0871 100644 --- a/drivers/staging/speakup/i18n.h +++ b/drivers/staging/speakup/i18n.h @@ -106,19 +106,23 @@ enum msg_index_t { MSG_KEYNAMES_START, MSG_KEYNAME_ESC = MSG_KEYNAMES_START, MSG_KEYNAME_1, MSG_KEYNAME_2, MSG_KEYNAME_3, MSG_KEYNAME_4, - MSG_KEYNAME_5, MSG_KEYNAME_6, MSG_KEYNAME_7, MSG_KEYNAME_8, MSG_KEYNAME_9, + MSG_KEYNAME_5, MSG_KEYNAME_6, MSG_KEYNAME_7, MSG_KEYNAME_8, + MSG_KEYNAME_9, MSG_KEYNAME_0, MSG_KEYNAME_DASH, MSG_KEYNAME_EQUAL, MSG_KEYNAME_BS, MSG_KEYNAME_TAB, - MSG_KEYNAME_Q, MSG_KEYNAME_W, MSG_KEYNAME_E, MSG_KEYNAME_R, MSG_KEYNAME_T, - MSG_KEYNAME_Y, MSG_KEYNAME_U, MSG_KEYNAME_I, MSG_KEYNAME_O, MSG_KEYNAME_P, + MSG_KEYNAME_Q, MSG_KEYNAME_W, MSG_KEYNAME_E, MSG_KEYNAME_R, + MSG_KEYNAME_T, MSG_KEYNAME_Y, MSG_KEYNAME_U, MSG_KEYNAME_I, + MSG_KEYNAME_O, MSG_KEYNAME_P, MSG_KEYNAME_LEFTBRACE, MSG_KEYNAME_RIGHTBRACE, MSG_KEYNAME_ENTER, MSG_KEYNAME_LEFTCTRL, MSG_KEYNAME_A, - MSG_KEYNAME_S, MSG_KEYNAME_D, MSG_KEYNAME_F, MSG_KEYNAME_G, MSG_KEYNAME_H, - MSG_KEYNAME_J, MSG_KEYNAME_K, MSG_KEYNAME_L, MSG_KEYNAME_SEMICOLON, + MSG_KEYNAME_S, MSG_KEYNAME_D, MSG_KEYNAME_F, MSG_KEYNAME_G, + MSG_KEYNAME_H, MSG_KEYNAME_J, MSG_KEYNAME_K, MSG_KEYNAME_L, + MSG_KEYNAME_SEMICOLON, MSG_KEYNAME_SINGLEQUOTE, MSG_KEYNAME_GRAVE, - MSG_KEYNAME_LEFTSHFT, MSG_KEYNAME_BACKSLASH, MSG_KEYNAME_Z, MSG_KEYNAME_X, - MSG_KEYNAME_C, MSG_KEYNAME_V, MSG_KEYNAME_B, MSG_KEYNAME_N, MSG_KEYNAME_M, - MSG_KEYNAME_COMMA, MSG_KEYNAME_DOT, MSG_KEYNAME_SLASH, MSG_KEYNAME_RIGHTSHFT, + MSG_KEYNAME_LEFTSHFT, MSG_KEYNAME_BACKSLASH, MSG_KEYNAME_Z, + MSG_KEYNAME_X, MSG_KEYNAME_C, MSG_KEYNAME_V, MSG_KEYNAME_B, + MSG_KEYNAME_N, MSG_KEYNAME_M, MSG_KEYNAME_COMMA, MSG_KEYNAME_DOT, + MSG_KEYNAME_SLASH, MSG_KEYNAME_RIGHTSHFT, MSG_KEYNAME_KPSTAR, MSG_KEYNAME_LEFTALT, MSG_KEYNAME_SPACE, MSG_KEYNAME_CAPSLOCK, MSG_KEYNAME_F1, MSG_KEYNAME_F2, @@ -144,8 +148,9 @@ enum msg_index_t { MSG_KEYNAME_INS, MSG_KEYNAME_DEL, MSG_KEYNAME_MACRO, MSG_KEYNAME_MUTE, MSG_KEYNAME_VOLDOWN, MSG_KEYNAME_VOLUP, - MSG_KEYNAME_POWER, MSG_KEYNAME_KPEQUAL, MSG_KEYNAME_KPPLUSDASH, MSG_KEYNAME_PAUSE, MSG_KEYNAME_F21, - MSG_KEYNAME_F22, MSG_KEYNAME_F23, MSG_KEYNAME_F24, MSG_KEYNAME_KPCOMMA, MSG_KEYNAME_LEFTMETA, + MSG_KEYNAME_POWER, MSG_KEYNAME_KPEQUAL, MSG_KEYNAME_KPPLUSDASH, + MSG_KEYNAME_PAUSE, MSG_KEYNAME_F21, MSG_KEYNAME_F22, MSG_KEYNAME_F23, + MSG_KEYNAME_F24, MSG_KEYNAME_KPCOMMA, MSG_KEYNAME_LEFTMETA, MSG_KEYNAME_RIGHTMETA, MSG_KEYNAME_COMPOSE, MSG_KEYNAME_STOP, MSG_KEYNAME_AGAIN, MSG_KEYNAME_PROPS, MSG_KEYNAME_UNDO, MSG_KEYNAME_FRONT, MSG_KEYNAME_COPY, MSG_KEYNAME_OPEN, @@ -180,7 +185,8 @@ enum msg_index_t { MSG_FUNCNAME_CHAR_PHONETIC, MSG_FUNCNAME_CHAR_PREVIOUS, MSG_FUNCNAME_CURSOR_PARK, MSG_FUNCNAME_CUT, MSG_FUNCNAME_EDIT_DELIM, MSG_FUNCNAME_EDIT_EXNUM, - MSG_FUNCNAME_EDIT_MOST, MSG_FUNCNAME_EDIT_REPEATS, MSG_FUNCNAME_EDIT_SOME, + MSG_FUNCNAME_EDIT_MOST, MSG_FUNCNAME_EDIT_REPEATS, + MSG_FUNCNAME_EDIT_SOME, MSG_FUNCNAME_GOTO, MSG_FUNCNAME_GOTO_BOTTOM, MSG_FUNCNAME_GOTO_LEFT, MSG_FUNCNAME_GOTO_RIGHT, MSG_FUNCNAME_GOTO_TOP, MSG_FUNCNAME_HELP, MSG_FUNCNAME_LINE_SAY_CURRENT, MSG_FUNCNAME_LINE_SAY_NEXT, diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c index 0cd3cdb..1cfff16 100644 --- a/drivers/staging/speakup/main.c +++ b/drivers/staging/speakup/main.c @@ -78,7 +78,8 @@ int spk_key_echo, spk_say_word_ctl; int spk_say_ctrl, spk_bell_pos; short spk_punc_mask; int spk_punc_level, spk_reading_punc; -char spk_str_caps_start[MAXVARLEN + 1] = "\0", spk_str_caps_stop[MAXVARLEN + 1] = "\0"; +char spk_str_caps_start[MAXVARLEN + 1] = "\0"; +char spk_str_caps_stop[MAXVARLEN + 1] = "\0"; const struct st_bits_data spk_punc_info[] = { {"none", "", 0}, {"some", "/$%&@", SOME}, @@ -647,8 +658,8 @@ static void say_next_word(struct vc_data *vc) u_char temp; char ch; u_short edge_said = 0, last_state = 2, state = 0; - spk_parked |= 0x01; + spk_parked |= 0x01; if (spk_x == vc->vc_cols - 1 && spk_y == vc->vc_rows - 1) { announce_edge(vc, edge_bottom); return; @@ -1939,7 +1976,6 @@ static void speakup_goto(struct vc_data *vc) } synth_printf("%s\n", spk_msg_get(MSG_GOTO)); spk_special_handler = handle_goto; - return; } static void speakup_help(struct vc_data *vc) diff --git a/drivers/staging/speakup/varhandlers.c b/drivers/staging/speakup/varhandlers.c index 445a3fd..d758284 100644 --- a/drivers/staging/speakup/varhandlers.c +++ b/drivers/staging/speakup/varhandlers.c @@ -112,7 +112,6 @@ void speakup_register_var(struct var_t *var) default: break; } - return; } void speakup_unregister_var(enum var_id_t var_id) Cheers, Domagoj -- (\/)(;,,;)(\/)