Fix word repetitions
Subsystems (3)
PATCH 1/1 Fix word repetitions
--- Documentation/howto-pull-request.txt | 2 +- disk-utils/partx.c | 2 +- lib/sysfs.c | 2 +- libmount/src/cache.c | 2 +- libmount/src/fs.c | 2 +- libmount/src/tab.c | 2 +- libsmartcols/samples/fromfile.c | 2 +- login-utils/last.c | 2 +- misc-utils/blkid.c | 2 +- misc-utils/cal.c | 2 +- misc-utils/findmnt.c | 2 +- misc-utils/look.c | 2 +- misc-utils/lsblk.c | 2 +- misc-utils/test_uuidd.c | 2 +- misc-utils/wipefs.c | 2 +- sys-utils/chcpu.c | 2 +- sys-utils/dmesg.c | 2 +- sys-utils/fallocate.c | 2 +- sys-utils/fsfreeze.c | 2 +- sys-utils/hwclock.c | 4 ++-- sys-utils/mount.c | 2 +- sys-utils/swapon.c | 2 +- sys-utils/umount.c | 2 +- sys-utils/wdctl.c | 2 +- term-utils/agetty.c | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-)
Documentation/howto-pull-request.txt +1 -1
@@ -29,7 +29,7 @@ Branches -------- 1. Use the name of the subsystem, such as blkid, libmount, misc-utils, -that is the common thing for changes in in the change set. +that is the common thing for changes in the change set. 2. If the changes do not have anything in common use some random name, such as YYYY-MM-DD of the first patch in the branch. Name of the branch
disk-utils/partx.c +1 -1
@@ -812,7 +812,7 @@ int main(int argc, char **argv) { NULL, 0, NULL, 0 } }; -static const ul_excl_t excl[] = {/* rows and cols in in ASCII order */ +static const ul_excl_t excl[] = {/* rows and cols in ASCII order */ {'P' ,'a' ,'d' ,'l' ,'r' ,'s' ,'u' }, {0 } };
lib/sysfs.c +1 -1
@@ -623,7 +623,7 @@ static char *get_subsystem(char *chain, char *buf, size_t bufsz) }/* -* Returns complete path to the device, the patch contains all all subsystems +* Returns complete path to the device, the patch contains all subsystems * used for the device. */ char *sysfs_get_devchain (struct sysfs_cxt *cxt,char *buf,size_t bufsz)
libmount/src/cache.c +1 -1
@@ -85,7 +85,7 @@ struct libmnt_cache *mnt_new_cache(void)* @cache: pointer to struct libmnt_cache instance * * Deallocates the cache. This function does not care about reference count. Don't -* use this function directly -- it's better to use use mnt_unref_cache(). +* use this function directly -- it's better to use mnt_unref_cache(). */ void mnt_free_cache (struct libmnt_cache *cache) {
libmount/src/fs.c +1 -1
@@ -43,7 +43,7 @@ struct libmnt_fs *mnt_new_fs(void)* @fs: fs pointer * * Deallocates the fs. This function does not care about reference count. Don't -* use this function directly -- it's better to use use mnt_unref_fs(). +* use this function directly -- it's better to use mnt_unref_fs(). * * The reference counting is supported since util-linux v2.24. */
libmount/src/tab.c +1 -1
@@ -150,7 +150,7 @@ void mnt_unref_table(struct libmnt_table *tb)* @tb: tab pointer * * Deallocates the table. This function does not care about reference count. Don't -* use this function directly -- it's better to use use mnt_unref_table(). +* use this function directly -- it's better to use mnt_unref_table(). * * The table entries (filesystems) are unreferenced by mnt_reset_table() and * cache by mnt_unref_cache().
libsmartcols/samples/fromfile.c +1 -1
@@ -236,7 +236,7 @@ int main(int argc, char *argv[]) { NULL, 0, 0, 0 }, }; -static const ul_excl_t excl[] = {/* rows and cols in in ASCII order */ +static const ul_excl_t excl[] = {/* rows and cols in ASCII order */ {'E' ,'J' ,'r' }, {0 } };
login-utils/last.c +1 -1
@@ -920,7 +920,7 @@ int main(int argc, char **argv) { "time-format", required_argument, NULL, OPT_TIME_FORMAT }, { NULL, 0, NULL, 0 } }; -static const ul_excl_t excl[] = {/* rows and cols in in ASCII order */ +static const ul_excl_t excl[] = {/* rows and cols in ASCII order */ {'F' ,OPT_TIME_FORMAT },/* fulltime, time-format */ {0 } };
misc-utils/blkid.c +1 -1
@@ -649,7 +649,7 @@ int main(int argc, char **argv)int c;uintmax_t offset =0 , size =0 ; -static const ul_excl_t excl[] = {/* rows and cols in in ASCII order */ +static const ul_excl_t excl[] = {/* rows and cols in ASCII order */ {'n' ,'u' }, {0 } };
misc-utils/cal.c +1 -1
@@ -284,7 +284,7 @@ int main(int argc, char **argv) {NULL, 0, NULL, 0} }; -static const ul_excl_t excl[] = {/* rows and cols in in ASCII order */ +static const ul_excl_t excl[] = {/* rows and cols in ASCII order */ {'Y' ,'n' ,'y' }, {0 } };
misc-utils/findmnt.c +1 -1
@@ -1308,7 +1308,7 @@ int main(int argc, char *argv[]) { NULL, 0, 0, 0 } }; -static const ul_excl_t excl[] = {/* rows and cols in in ASCII order */ +static const ul_excl_t excl[] = {/* rows and cols in ASCII order */ {'C' ,'c' },/* [no]canonicalize */ {'C' ,'e' },/* nocanonicalize, evaluate */ {'J' ,'P' ,'r' ,'x' },/* json,pairs,raw,verify */
misc-utils/look.c +1 -1
@@ -171,7 +171,7 @@ look(char *front, char *back)int ch;char *readp, *writep; -/* Reformat string string to avoid doing it multiple times later. */ +/* Reformat string to avoid doing it multiple times later. */ if (dflag) {for (readp = writep = string; (ch = *readp++) !=0 ;) {if (isalnum (ch) ||isblank (ch))
misc-utils/lsblk.c +1 -1
@@ -1696,7 +1696,7 @@ int main(int argc, char *argv[]) { NULL, 0, 0, 0 }, }; -static const ul_excl_t excl[] = {/* rows and cols in in ASCII order */ +static const ul_excl_t excl[] = {/* rows and cols in ASCII order */ {'D' ,'O' }, {'I' ,'e' }, { 'J', 'P', 'r' },
misc-utils/test_uuidd.c +1 -1
@@ -77,7 +77,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out) {fprintf (out,"\n %s [options]\n" , program_invocation_short_name); -fprintf (out," -p <num> number of of nprocesses (default:%zu)\n" , nprocesses); +fprintf (out," -p <num> number of nprocesses (default:%zu)\n" , nprocesses);fprintf (out," -t <num> number of nthreads (default:%zu)\n" , nthreads);fprintf (out," -o <num> number of nobjects (default:%zu)\n" , nobjects);fprintf (out," -l <level> log level (default:%zu)\n" , loglev);
misc-utils/wipefs.c +1 -1
@@ -497,7 +497,7 @@ main(int argc, char **argv) { NULL, 0, 0, 0 } }; -static const ul_excl_t excl[] = {/* rows and cols in in ASCII order */ +static const ul_excl_t excl[] = {/* rows and cols in ASCII order */ {'a' ,'o' }, {0 } };
sys-utils/chcpu.c +1 -1
@@ -273,7 +273,7 @@ int main(int argc, char *argv[]) { NULL, 0, 0, 0 } }; -static const ul_excl_t excl[] = {/* rows and cols in in ASCII order */ +static const ul_excl_t excl[] = {/* rows and cols in ASCII order */ {'c' ,'d' ,'e' ,'g' ,'p' }, {0 } };
sys-utils/dmesg.c +1 -1
@@ -1261,7 +1261,7 @@ int main(int argc, char *argv[]) { NULL, 0, NULL, 0 } }; -static const ul_excl_t excl[] = {/* rows and cols in in ASCII order */ +static const ul_excl_t excl[] = {/* rows and cols in ASCII order */ {'C' ,'D' ,'E' ,'c' ,'n' ,'r' },/* clear,off,on,read-clear,level,raw*/ {'H' ,'r' },/* human, raw */ {'L' ,'r' },/* color, raw */
sys-utils/fallocate.c +1 -1
@@ -288,7 +288,7 @@ int main(int argc, char **argv) { NULL, 0, 0, 0 } }; -static const ul_excl_t excl[] = {/* rows and cols in in ASCII order */ +static const ul_excl_t excl[] = {/* rows and cols in ASCII order */ {'c' ,'d' ,'p' ,'z' }, {'c' ,'n' }, {0 }
sys-utils/fsfreeze.c +1 -1
@@ -78,7 +78,7 @@ int main(int argc, char **argv) { NULL, 0, 0, 0 } }; -static const ul_excl_t excl[] = {/* rows and cols in in ASCII order */ +static const ul_excl_t excl[] = {/* rows and cols in ASCII order */ {'f' ,'u' },/* freeze, unfreeze */ {0 } };
sys-utils/hwclock.c +2 -2
@@ -712,7 +712,7 @@ display_time(const bool hclock_valid, struct timeval hwctime)* runnable by issuing the command "date" to the /bin/sh shell. That means * in must be in the current PATH. * -* If anything goes wrong (and many things can), we return return code 10 +* If anything goes wrong (and many things can), we return code 10 * and arbitrary *time_p. Otherwise, return code is 0 and *time_p is valid. */ static int interpret_date_string (const char *date_opt,time_t *const time_p)
@@ -1703,7 +1703,7 @@ int main(int argc, char **argv) {NULL, 0, NULL, 0} }; -static const ul_excl_t excl[] = {/* rows and cols in in ASCII order */ +static const ul_excl_t excl[] = {/* rows and cols in ASCII order */ {'a' ,'r' ,'s' ,'w' ,OPT_GET ,OPT_GETEPOCH ,OPT_PREDICT_HC ,OPT_SET ,OPT_SETEPOCH ,OPT_SYSTZ },
sys-utils/mount.c +1 -1
@@ -868,7 +868,7 @@ int main(int argc, char **argv) { NULL, 0, 0, 0 } }; -static const ul_excl_t excl[] = {/* rows and cols in in ASCII order */ +static const ul_excl_t excl[] = {/* rows and cols in ASCII order */ {'B' ,'M' ,'R' },/* bind,move,rbind */ {'L' ,'U' ,MOUNT_OPT_SOURCE },/* label,uuid,source */ {0 }
sys-utils/swapon.c +1 -1
@@ -862,7 +862,7 @@ int main(int argc, char *argv[]) { NULL, 0, 0, 0 } }; -static const ul_excl_t excl[] = {/* rows and cols in in ASCII order */ +static const ul_excl_t excl[] = {/* rows and cols in ASCII order */ {'a' ,'o' ,'s' ,SHOW_OPTION }, {'a' ,'o' ,BYTES_OPTION }, {'a' ,'o' ,NOHEADINGS_OPTION },
sys-utils/umount.c +1 -1
@@ -527,7 +527,7 @@ int main(int argc, char **argv) { NULL, 0, 0, 0 } }; -static const ul_excl_t excl[] = {/* rows and cols in in ASCII order */ +static const ul_excl_t excl[] = {/* rows and cols in ASCII order */ {'A' ,'a' },/* all-targets,all */ {'R' ,'a' },/* recursive,all */ {'O' ,'R' ,'t' },/* options,recursive,types */
sys-utils/wdctl.c +1 -1
@@ -495,7 +495,7 @@ int main(int argc, char *argv[]) { NULL, 0, NULL, 0 } }; -static const ul_excl_t excl[] = {/* rows and cols in in ASCII order */ +static const ul_excl_t excl[] = {/* rows and cols in ASCII order */ {'F' ,'f' },/* noflags,flags*/ {0 } };
term-utils/agetty.c +1 -1
@@ -2554,7 +2554,7 @@ static void init_special_char(char* arg, struct options *op) }/* -* Appends @str to @dest and if @dest is not empty then use use @sep as a +* Appends @str to @dest and if @dest is not empty then use @sep as a * separator. The maximal final length of the @dest is @len. * * Returns the final @dest length or -1 in case of error.
Signature · 1 line
2.7.4
Quoted 18 lines · Yuri Chornoivan
Documentation/howto-pull-request.txt | 2 +- disk-utils/partx.c | 2 +- lib/sysfs.c | 2 +- libmount/src/cache.c | 2 +- libmount/src/fs.c | 2 +- libmount/src/tab.c | 2 +- libsmartcols/samples/fromfile.c | 2 +- login-utils/last.c | 2 +- misc-utils/blkid.c | 2 +- misc-utils/cal.c | 2 +- misc-utils/findmnt.c | 2 +- misc-utils/look.c | 2 +- misc-utils/lsblk.c | 2 +- misc-utils/test_uuidd.c | 2 +- misc-utils/wipefs.c | 2 +- sys-utils/chcpu.c | 2 +- sys-utils/dmesg.c | 2 +- sys-utils/fallocate.c | 2 +-
Quoted 8 lines
sys-utils/fsfreeze.c | 2 +- sys-utils/hwclock.c | 4 ++-- sys-utils/mount.c | 2 +- sys-utils/swapon.c | 2 +- sys-utils/umount.c | 2 +- sys-utils/wdctl.c | 2 +- term-utils/agetty.c | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-)
Applied, thanks!
Karel
Signature · 2 lines
Karel Zak <[email protected]> http://karelzak.blogspot.com
Am 10.02.2017 um 12:05 schrieb Yuri Chornoivan:
misc-utils/look.c look(char *front, char *back) · line 177
Quoted 13 lines
misc-utils/look.c +1
-1@@ -171,7 +171,7 @@ look(char *front, char *back)int ch;char *readp, *writep; -/* Reformat string string to avoid doing it multiple times later. */ +/* Reformat string to avoid doing it multiple times later. */ if (dflag) {for (readp = writep = string; (ch = *readp++) !=0 ;) {if (isalnum (ch) ||isblank (ch))
Actually I don't think this is a word repetition. It looks to me like it's really talking about "string string" - the string held in the variable named "string".
sys-utils/hwclock.c display_time(const bool hclock_valid, struct timeval hwctime) · line 718
Quoted 13 lines
sys-utils/hwclock.c +1
-1@@ -712,7 +712,7 @@ display_time(const bool hclock_valid, struct timeval hwctime)* runnable by issuing the command "date" to the /bin/sh shell. That means * in must be in the current PATH. * -* If anything goes wrong (and many things can), we return return code 10 +* If anything goes wrong (and many things can), we return code 10 * and arbitrary *time_p. Otherwise, return code is 0 and *time_p is valid. */ static int interpret_date_string (const char *date_opt,time_t *const time_p)
Nor is this, as it talks about the return code that will be returned.
Regards,
Tilman
Signature · 3 lines
Tilman Schmidt E-Mail: [email protected] Bonn, Germany Nous, on a des fleurs et des bougies pour nous protéger.
Quoted 7 lines · Tilman Schmidt
Am 10.02.2017 um 12:05 schrieb Yuri Chornoivan:
misc-utils/look.c look(char *front, char *back) · line 174
Quoted 2 lines
misc-utils/look.c +1
-1-/* Reformat string string to avoid doing it multiple times later. */ +/* Reformat string to avoid doing it multiple times later. */ Actually I don't think this is a word repetition. It looks to me like it's really talking about "string string" - the string held in the variable named "string".
That sounds like a valid interpretation, but the new version reads
better.
Quoted 4 lines
Quoted 2 lines
- * If anything goes wrong (and many things can), we return return code 10
+ * If anything goes wrong (and many things can), we return code 10Nor is this, as it talks about the return code that will be returned.
Good point here. The original version works, but is more verbose
than it needs to be.
"we return code 10" is a valid way to describe the return value, but just "we return 10" is simpler and unambiguous. I don't think the comment needs to explicitly call it a code.
Signature · 6 lines
#define X(x,y) x##y Peter Cordes ; e-mail: X(peter@cor , des.ca) "The gods confound the man who first found out how to distinguish the hours! Confound him, too, who in this place set up a sundial, to cut and hack my day so wretchedly into small pieces!" -- Plautus, 200 BC