From c3ac29d88737dea8b98f6ba7ddf442d5b276b2fd Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Fri, 15 Sep 2023 12:19:40 +0300 Subject: [PATCH] tweak: use else if instead of wrapped else, if +formatting --- src/extra/chc/chc.c | 4 ++-- src/extra/lc/lc.c | 8 ++++---- src/wc | Bin 17032 -> 16984 bytes src/wc.c | 20 +++++++++----------- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/extra/chc/chc.c b/src/extra/chc/chc.c index b86169c..cebd292 100644 --- a/src/extra/chc/chc.c +++ b/src/extra/chc/chc.c @@ -6,7 +6,7 @@ int chc(FILE* fp) register int c; int num_chars = 0; while ((c = getc(fp)) != EOF) { - num_chars ++; + num_chars++; } printf("%i\n", num_chars); return 0; @@ -22,7 +22,7 @@ int main(int argc, char** argv) perror("Could not open file"); return 1; } - return chc(fp) && fclose(fp); + return chc(fp) && fclose(fp); } else { printf("Usage: chc file.txt\n"); printf(" or: cat file.txt | chc\n"); diff --git a/src/extra/lc/lc.c b/src/extra/lc/lc.c index 44f782c..dab48d6 100644 --- a/src/extra/lc/lc.c +++ b/src/extra/lc/lc.c @@ -6,11 +6,11 @@ int lc(FILE* fp) int num_lines = 0; register int c; while ((c = getc(fp)) != EOF) { - if (c == '\n' ) { - num_lines ++; + if (c == '\n') { + num_lines++; } } - // num_lines += (c != '\n'); // < judgment call, adds a line if the last line isn't followed by a newline. + // num_lines += (c != '\n'); // < judgment call, adds a line if the last line isn't followed by a newline. printf("%i\n", num_lines); return 0; } @@ -25,7 +25,7 @@ int main(int argc, char** argv) perror("Could not open file"); return 1; } - return lc(fp) && fclose(fp); + return lc(fp) && fclose(fp); } else { printf("Usage: lc file.txt\n"); printf(" or: cat file.txt | lc\n"); diff --git a/src/wc b/src/wc index c7ba97017285d0376fd2b2a8dba1e2e4e56f5eee..d2911b8547aa2411bf7bbca06a574c642270825d 100755 GIT binary patch delta 2071 zcmZ`)eQZ-z6u-A0>wD6zeQW1i$4A!N65H^KaU`u8q zVPwqEKts#HI1~OT1V0u-WNAXkg4&77UqqG=oqv#QF~%;SID|-y_&oQ0EHLA3?mOpq zKJPvE+}mSAbn+-omkU{es3WEkGMuUXm`~U=l*s%j@k3?}41qv5_|kP6N=Kfg1125A z5h@B<-72eFWpg96mHw}DLU&F8Z{Fb^KfijdciD+6FOEOmzUji+tz+*`b;CR6XFUrr z1;tsUraDUokTRJaJ~vm>KA1L(r>qumTii4Rf<>e+sNW1zP^Zc-R=?HiH_PO3%u;S` z!5~#IYI0EtsI|(nXLs*TsIt~rckX@b;BMGvP3|MaOicJA>Q`GYMV_t4iIa_9PY=)R zwjdidK6px)mdZRt>P7Tj4^H=)u5qbDT=~h zb)3#SF6HIHueoj8uga;&b!PB9s*u0Q_^8JJ!uTNaf&A?W)MXfc9r0yW{o7y2$0J8! zM5xU0)9BTVjGVFt8EJmlTP7d3{)TNT59ND#Wy;|lU?sV# zQ?%z*`;f^GD@qsAZ$K_xQhS~Cb>DNF<-y1~#>&Z`d+nJ1BLs!oe-x##3v+&J{SZ!; z2CQ=OZb63YrArnw)!;*=Z@Mkzu9j1wx?)1UWQz~v3%7uCEeblkF}0-eSJtN@gUbnt zZ|O*WAK%=Od=P&*p8R{WoT}?Z@uu~)kL1BST;aRiYp!#4Jf`|nmFb}ScSSjm@s=XJ zg7hd-3no}Pt0=n=yYDH=O(sX$g7W+K;H%1I^fJs;E~E*t`l`FS?<$JX$!JO3ID2t+ zqP!ESF;*aR0%sG3-phpTCC(G3H6`Wmn%9(64q8m@PnDFfE^)S%aO>FZY{1Eu)DKBt zn8sk-x6aayzA#(w%H447U%(spAO@K_N$7W>F%FMLNE#;UymT05>m*9R=l9Yvi2EfW zt@p0}cA(u6zgL*j+gpFZ2nVD74RjKy#Qc2H9-4)C&;@yu1+r3oZc-|z7CL2js=tC$gK0^V-$;^}|TP(w2?-f)=qLp)UGa+0+EGO6c_<_YkHM9)cV z949-Mm=QsvXJ8bypQ2VUc?dU8dl{xfB7Y6FrRvT+jWr$b>B#u^!AC_MKd2chh;v?y zpA2ukUZ-{Y0$Ud~!P!QUma#8n8!d3N(QOG~TYwOBnaBp9VUfPcw7K%|J_^H4uR>At zdG(dgooVi&Ic`-arA^S&A_>H*ht}yBOklTMX;~zU84{gVz)Xw8PwEJpCKBe2rs1F~ z5}xZtqbKpKB8TCVXeG!|C!f|YTN=8eVb~gVa-Di=n23mQEh-3eZKZF!4`!kgZ(NXm z@U{L4TVwSg$DA;XvpZJL&;8}X*;sh)$kTd-6EG7~XdY(bVV;Dwe21X6EldwVS6j`$ Dcfr*E delta 2118 zcmZ`)eQZ-z6u)=<*dBCiU$^;MK-%%O4eclGy0LX@$HF=tf*?qOW*FFD2*R+C5hZMv zkv6PxLa&S9vilzd~&*8hjRld-Aar$RNBbuYX7(U3(f_D`qMh&K* z*wyJ&$4Cbv<8on0F_-RzF@-?q1FsZlS^8^Fe^;fyN77a=li|G5Kn-bjcKRDn+v;Ex zBNxKBat`QJ3-p_sgBwW8hOOJ*ZYC|QTbtk74wb6NHdbmDQDB!O_N6GZ!gSbK3mRKF zftl98vwg8RUn%rxXSZ-ih_B%O;baQgH z*a(>r=f4RHbz2HIvq~n$J4I3Kxv!o52o1|@@U^beh0=FcLbRqjLS)OAQ}m%J`Z-AH z%<6CR2uWOm*}QROGY-pL)gB(!emWcoeUY>7^{auX_cU`@j3$)NGTAE0Uom+O%8ubX zqiAbm`cBl(vrV~kF>uhk5hA>0%?Rp&Xzubfc+1g4ES$ij`d1G|8LiBy(le+?1q%ZQ zRo|m6&@~+7#9LZZ2V1tQGNS)DGe+INT0on zk-z<~_#^+U4n!?gNUv%veH;k=o|8B_V9h_SIb`l}&budyCvX54;swMLh)PUSmlVZ~ zjGqw29}v$XRv|y{K3p*`px0sCJd<{Ss%Y*T?RP~na|_Uu6krcx-+}xNM#$}X#BS_s zacE{IOY?NyS#^1a1B$vlb4Z!>(zHCol002)UQYdVG`p~~l41}k^3WY{xu{+l!&pe# z^9TC!Tc>lGJG35-SZsVeADyuoB_LtAVKLDjcxbWV)i1T0=oM(N+W4@1(&Yz;#35oe z@kDS@owC^9%;(k`GOX)jc8Bn3qdftJ9_jzT4t zo((G;{2^+u2#rO)>e`}G6 zO~D?Q2`fM1DyApkvTGlWgWp{U3*35R2X4O}bN9v?+WGN&&Nd%XK{I^>zaF|PnZH4mGsbx>Yy=lbP))(=T< zF~q8Md}i_)?1I5+8<)8XaY$A_;4;6SFeGa{kf^c4TAvO|u($i{Pp?B*Uhj4o^oe-E W2mKz-;E^gh1P}cl`Vly4i~j}RK?zO( diff --git a/src/wc.c b/src/wc.c index 15196f9..f71f397 100644 --- a/src/wc.c +++ b/src/wc.c @@ -8,14 +8,12 @@ int wc(FILE* fp) while ((c = getc(fp)) != EOF) { if (c != ' ' && c != '\n' && c != '\t') { word = 1; - } else { - if (word) { - num_words++; - word = 0; - } + } else if (word) { + num_words++; + word = 0; } } - num_words+=word; + num_words += word; printf("%i\n", num_words); return 0; } @@ -30,11 +28,11 @@ int main(int argc, char** argv) perror("Could not open file"); return 1; } - int wc_status = wc(fp); - int fclose_status = fclose(fp); - return (wc_status == 0) && (fclose_status ==0); - // can't do return wc_status == 0 && fclose_status == 0; - // because then if wc returns with -1, fclose is not called. + int wc_status = wc(fp); + int fclose_status = fclose(fp); + return (wc_status == 0) && (fclose_status == 0); + // can't do return wc_status == 0 && fclose_status == 0; + // because then if wc returns with -1, fclose is not called. } else { printf("Usage: wc file.txt\n"); printf(" or: cat file.txt | wc\n");