From 872bd8603d80c229890c2f71fa9ec513d4098611 Mon Sep 17 00:00:00 2001 From: Adam Joly Date: Mon, 6 Nov 2023 17:25:35 +0100 Subject: [PATCH] day update --- Makefile | 2 +- ft_memchr.c | 12 ++++++++++-- ft_strncmp.c | 8 +++++--- libft.h | 3 ++- libft.so | Bin 15968 -> 15928 bytes 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 1696cc5..b701610 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: adjoly +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2023/11/01 11:03:22 by adjoly #+# #+# # -# Updated: 2023/11/05 22:23:43 by adjoly ### ########.fr # +# Updated: 2023/11/06 11:12:48 by adjoly ### ########.fr # # # # **************************************************************************** # diff --git a/ft_memchr.c b/ft_memchr.c index abccd56..927d102 100644 --- a/ft_memchr.c +++ b/ft_memchr.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/05 14:52:53 by adjoly #+# #+# */ -/* Updated: 2023/11/05 14:54:57 by adjoly ### ########.fr */ +/* Updated: 2023/11/06 15:37:15 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,5 +14,13 @@ void *ft_memchr(const void *s, int c, size_t n) { - + int i; + + i = 0; + while (i < n && ((unsigned char *)s)[i] && ((char *)s) != c) + { + s++; + i++; + } + return (NULL); } diff --git a/ft_strncmp.c b/ft_strncmp.c index 656bd37..71eaf9b 100644 --- a/ft_strncmp.c +++ b/ft_strncmp.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/05 10:40:45 by adjoly #+# #+# */ -/* Updated: 2023/11/05 11:02:33 by adjoly ### ########.fr */ +/* Updated: 2023/11/06 14:53:38 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,7 +17,9 @@ int ft_strncmp(const char *s1, const char *s2, size_t n) size_t i; i = 0; - while (s1[i] && s2[i] && i < n && s1[i] != s2[i]) + if (n == 0) + return (0); + while (s1[i] == s2[i] && s1[i] && i < n - 1) i++; - return (s1[i] - s2[i]); + return ((unsigned char)s1[i] - (unsigned char)s2[i]); } diff --git a/libft.h b/libft.h index eef2e41..d402f9a 100644 --- a/libft.h +++ b/libft.h @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/01 10:06:03 by adjoly #+# #+# */ -/* Updated: 2023/11/05 21:34:36 by adjoly ### ########.fr */ +/* Updated: 2023/11/06 11:03:52 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -44,5 +44,6 @@ int ft_isprint(int c); void *ft_memchr(const void *s, int c, size_t n); char *ft_itoa(int n); void *ft_memmove(void *dest, const void *src, size_t n); +void *ft_memchr(const void *s, int c, size_t n); #endif \ No newline at end of file diff --git a/libft.so b/libft.so index 8fde708cce1b8cdd9c78d7697af888d3637e303c..143198150b5dae9c24b0a3cd20d49204438495eb 100755 GIT binary patch delta 1702 zcmZ9Me@t6d6vyu^#Zdx0espV#NFQzqBSf)6Ge{Vg=$kK5BK`qEr%5X&qER>EADeMV zn}Sm758xy-Cc40qC7SFHOp`f`(RQ1FTQu?)#qdW_%-Te=ZdO-f_4&Q;y*6ey>G_^} zKj)l#?|JVvb?V}&*@L`$uI-rZd=1mb`MJdo+o08$49;zC*tQIxZP7CSz}}wB9{ckB zmtUIBZJzt3uW;h|Z@+jg_Kf8#ZVNUUfeqAReTdh_0#=FhYq9b2>)dtLWEEyDi)=Vo zW8-^{*y+Sx`(%nq(^XhqRSJS-J`_fHYE;Rp(SfA&byWrYv>F|PZ?E;ld)8-^4QaaL zjv!Awyvqcc+G~&`(o|_!~PtxLA2+ynGD>7}@?;BfHa;Sry^Vr#Dl*T=f ztS=RxDF?}Tgu%~TzIoX`xrI`V_+@WsniG2kvzjKF6~C!zKFqUFKXmYxrUju3&;@7;8i&egcM9r< zG7Dp~P#NmWAs@N~^+WxCA|INCE(rb?@-1wbvD+wsg%p&PpDA6Sg=nID4Ah;veV&uQKxwQ zeI=kflN9Q7c;5xBXO*nB*`ObrL8s02(mxpHVw@4{w9Xs&5^baUvKg0k7+icvVqB)W zE{E#}ld^rr>f?s6B=v*-T%`5J@==riPUE0?lMb4>7fo75i(QWLYP?s*Ib>Q#bi0`2 z9>>N18%Ed=<|XcRxO_$GGM2kc`WSgYhfTV42MtgF^wlE0+ep%%Io#K24)kr4X3gAY zoLY=|N_ZXolh~&BD32XE^t2^*rsp{eZzA41$+sxf+fkR5^+;A!KP7s#>Jjk=j3IjB Wrtc58+mdEa&k^rC#3!hyuk}Cvp#w1h delta 1901 zcmZWqZA@EL7(TZvQV4KctSj9R$~FUpxD{Blkc|oIb(bF`l?9bJMkmHpja!E!fw-o` zGQ+jeQBM45Vhl^vVWM%SKQ;{6%11VgfAGiR@Xu<3S*sW>v$~R1>vQfsEutskea?NK z_kG^?eDrYTZ2atao!|-ApDJ1{BidLEU)WbPWYj-~!plDtt>|;ILZ^lE*2pVezuuMJ zbX~kQR`9s9&_+)-EJcqQW`rVNB@d)E#>WJA^n_6qgqi5+f;)nJf^#MwVsPk_Z=$CQ zpR&?tx0eQ(Lk>x4In)^!ua=k^W5EqFCfycCJ9S3=Khvx+o$}Dfd73vpz=f&za(k&}L z%fVHr;!lPAsl;!DhAVe;%>Ir{MM@{HGSPl1CAVTSBA%;Y-`9)|07fE`i+dkmEdN6w zE8m}%XYY`NLf0yH2Kt%PpCaNryD&pXiRh>gS-+p$rWk=r#hiYS9=S?N}T{xlIs ztHAwBBsk|pQ(dau-nvzXhY2`);$)RpF@ugNEUtG`2rOCksbMO31dvnEcY*ei3 zF)XapHR}#KT2(GQ6aAp7UYKxL1MH6P#GksB%{l~}nVQWKU~C;H3RHn!p!;q%I|iHt zP66Yx}{HfNg&xpC%o(!VtC8R11r=v8Gn= z(H_i4=rC-IMqpJs4Qr;$uui%G>!$Wy)q;n%z^b$dwv7(MF42fKpN93(Wmq%a(ERq@ zEV2dGOnYFRbQso6BbuGwT^(4$>SoY9X)iOsWq6|W0mJ2zLc9s=78%jK536R|zRBOu z^LxO%vHIt>|e()->DfUe+8bA!Y}|&G80(y4ltd23rn=$p>}j3m)(>_q*9e$M{GG z!fp_Y&%d0SI&KU78nxy)yTqO-j7M}J-_f7I-sG%WuDjV&$VQx6_S@{gaMoF&dtF>P zMcen=Iy9hj{}A`bth(bf?ysg7P^*cvW}EK5$=O!=J=i0h zz4V_xyQtu@*?V)j?8k?}9z-_0w9#ejc%8FuUiW34BqKRZo~2zWa3SvZ@%^vk@evwE ztxq`X