staging: speakup: separate 80+ chars lines.
PATCH 1/1 staging: speakup: separate 80+ chars lines.
Increase readability of code following the Kernel coding style by breaking long lines and thus eliminating the checkpatch.pl warning.
--- drivers/staging/speakup/main.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/staging/speakup/main.c +9 -6
@@ -899,12 +899,13 @@ static int get_sentence_buf(struct vc_data *vc, int read_punc)while (start < end) { sentbuf[bn][i] =get_char (vc, (u_short *)start, &tmp);if (i >0 ) { -if (sentbuf[bn][i] ==SPACE && sentbuf[bn][i -1 ] =='.' && +if (sentbuf[bn][i] ==SPACE && + sentbuf[bn][i -1 ] =='.' && numsentences[bn] <9 ) {/* Sentence Marker */ numsentences[bn]++; sentmarks[bn][numsentences[bn]] = - &sentbuf[bn][i]; + &sentbuf[bn][i]; } } i++;
@@ -1233,7 +1234,8 @@ int spk_set_key_info(const u_char *key_info, u_char *k_buffer) key_data_len = (states +1 ) * (num_keys +1 );if (key_data_len +SHIFT_TBL_SIZE +4 >=sizeof (spk_key_buf)) {pr_debug ("too many key_infos (%d over %u)\n" , - key_data_len +SHIFT_TBL_SIZE +4 , (unsigned int )(sizeof (spk_key_buf))); + key_data_len +SHIFT_TBL_SIZE +4 , + (unsigned int )(sizeof (spk_key_buf)));return -EINVAL ; }memset (k_buffer,0 ,SHIFT_TBL_SIZE );
@@ -1247,8 +1249,8 @@ int spk_set_key_info(const u_char *key_info, u_char *k_buffer)for (i =1 ; i <= states; i++) { ch = *cp1++;if (ch >=SHIFT_TBL_SIZE ) { -pr_debug ("(%d) not valid shift state (max_allowed = %d)\n" , ch, -SHIFT_TBL_SIZE ); +pr_debug ("(%d) not valid shift state (max_allowed = %d)\n" , + ch,SHIFT_TBL_SIZE );return -EINVAL ; } spk_shift_table[ch] = i;
@@ -1256,7 +1258,8 @@ int spk_set_key_info(const u_char *key_info, u_char *k_buffer) keymap_flags = *cp1++;while ((ch = *cp1)) {if (ch >=MAX_KEY ) { -pr_debug ("(%d), not valid key, (max_allowed = %d)\n" , ch,MAX_KEY ); +pr_debug ("(%d), not valid key, (max_allowed = %d)\n" , + ch,MAX_KEY );return -EINVAL ; } spk_our_keys[ch] = cp1;
Signature · 6 lines
2.7.4 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Quoted 16 lines · Andrew Jye Shih Chuang
Increase readability of code following the Kernel coding style by breaking long lines and thus eliminating the checkpatch.pl warning.
Signed-off-by Andrew Jye Shih Chuang <[email protected]>--- drivers/staging/speakup/main.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)drivers/staging/speakup/main.c +0
-1@@ -899,12 +899,13 @@ static int get_sentence_buf(struct vc_data *vc, int read_punc)while (start < end) { sentbuf[bn][i] =get_char (vc, (u_short *)start, &tmp);if (i >0 ) { - if (sentbuf[bn][i] == SPACE && sentbuf[bn][i - 1] == '.' &&
drivers/staging/speakup/main.c static int get_sentence_buf(struct vc_data *vc, int read_punc) · line 910
Quoted 10 lines
drivers/staging/speakup/main.c +3
-1+if (sentbuf[bn][i] ==SPACE && + sentbuf[bn][i -1 ] =='.' && numsentences[bn] <9 ) {/* Sentence Marker */ numsentences[bn]++; sentmarks[bn][numsentences[bn]] = - &sentbuf[bn][i]; + &sentbuf[bn][i]; } }
FWIW I personally feel that this multi-line condition block becomes even less readable than it already was, and is one example where it's possibly better to ignore the limit or organize the code different. Just as an example, this one doing the same already looks more readable to me :
if (i > 0 && numsentences[bn] < 9 &&
sentbuf[bn][i] == SPACE && sentbuf[bn][i - 1] == '.') {
/* Sentence Marker */ numsentences[bn]++; sentmarks[bn][numsentences[bn]] = &sentbuf[bn][i];
}
Willy
Quoted 2 lines · Andrew Jye Shih Chuang
Increase readability of code following the Kernel coding style by breaking long lines and thus eliminating the checkpatch.pl warning.
The commit message also needs to be wrapped. I do it at 72 characters like an email. Roughly around the 70 character mark is fine.
drivers/staging/speakup/main.c int spk_set_key_info(const u_char *key_info, u_char *k_buffer) · line 1238
Quoted 7 lines
drivers/staging/speakup/main.c +2
-1@@ -1233,7 +1234,8 @@ int spk_set_key_info(const u_char *key_info, u_char *k_buffer) key_data_len = (states +1 ) * (num_keys +1 );if (key_data_len +SHIFT_TBL_SIZE +4 >=sizeof (spk_key_buf)) {pr_debug ("too many key_infos (%d over %u)\n" , - key_data_len +SHIFT_TBL_SIZE +4 , (unsigned int )(sizeof (spk_key_buf))); + key_data_len +SHIFT_TBL_SIZE +4 , + (unsigned int )(sizeof (spk_key_buf)));
This cast isn't needed. Just change the %u to %lu in the printk:
pr_debug("too many key_infos (%d over %lu)\n",
key_data_len + SHIFT_TBL_SIZE + 4, sizeof(spk_key_buf));
regards,
dan carpenter