From 822d3a75d3fbe4caa6c9bb6c1cbf706a8206a11d Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 22 Nov 2023 13:34:16 +0100 Subject: [PATCH] fix p --- ft_printf.c | 14 ++++++++------ ft_printf.h | 6 +++--- ft_printf.o | Bin 0 -> 3584 bytes ft_putchar.c | 2 +- ft_putchar.o | Bin 0 -> 1264 bytes ft_putnbr.c | 4 ++-- ft_putnbr.o | Bin 0 -> 1648 bytes ft_putnbrbase.c | 8 ++++---- ft_putnbrbase.o | Bin 0 -> 1520 bytes ft_putstr.o | Bin 0 -> 1488 bytes ft_strlen.o | Bin 0 -> 1136 bytes libftprintf.a | Bin 0 -> 11218 bytes 12 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 ft_printf.o create mode 100644 ft_putchar.o create mode 100644 ft_putnbr.o create mode 100644 ft_putnbrbase.o create mode 100644 ft_putstr.o create mode 100644 ft_strlen.o create mode 100644 libftprintf.a diff --git a/ft_printf.c b/ft_printf.c index ed2733a..f03ef69 100644 --- a/ft_printf.c +++ b/ft_printf.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/17 16:48:37 by adjoly #+# #+# */ -/* Updated: 2023/11/20 16:09:16 by adjoly ### ########.fr */ +/* Updated: 2023/11/22 13:01:29 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,12 +16,14 @@ int ft_putaddr(void *ptr) { int r; + if (ptr == NULL) + return (write(1, "(nil)", 5)); write(1, "0x", 2); r = ft_putnbrbase((long unsigned int)ptr, "0123456789abcdef"); return (2 + r); } -int ft_putnbrulong(unsigned long n) +int ft_putnbrulong(unsigned int n) { int len; @@ -46,17 +48,17 @@ int ft_printconversion(char conversion, va_list args) else if (conversion == 's') count = ft_putstr(va_arg(args, char *)); else if (conversion == 'c') - count = ft_putchar(va_arg(args, char *)[0]); + count = ft_putchar(va_arg(args, int)); else if (conversion == 'i' || conversion == 'd') count = ft_putnbr(va_arg(args, int)); else if (conversion == 'u') - count = ft_putnbrulong(va_arg(args, unsigned long)); + count = ft_putnbrulong(va_arg(args, unsigned int)); else if (conversion == 'p') count = ft_putaddr(va_arg(args, void *)); else if (conversion == 'x') - count = ft_putnbrbase(va_arg(args, unsigned int), "0123456789abcdef"); + count = ft_putnbrbase(va_arg(args, unsigned long), "0123456789abcdef"); else if (conversion == 'X') - count = ft_putnbrbase(va_arg(args, unsigned int), "0123456789ABCDEF"); + count = ft_putnbrbase(va_arg(args, unsigned long), "0123456789ABCDEF"); return (count); } diff --git a/ft_printf.h b/ft_printf.h index ff61971..f21ff19 100644 --- a/ft_printf.h +++ b/ft_printf.h @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/17 16:50:36 by adjoly #+# #+# */ -/* Updated: 2023/11/20 15:52:59 by adjoly ### ########.fr */ +/* Updated: 2023/11/22 11:24:27 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,11 +19,11 @@ int ft_printf(const char *format, ...); int ft_printconversion(char conversion, va_list args); -int ft_putnbrulong(unsigned long n); +int ft_putnbrulong(unsigned int n); int ft_putaddr(void *ptr); int ft_putstr(char *s); -int ft_putnbrbase(int n, char *base); +int ft_putnbrbase(unsigned long int n, char *base); int ft_putchar(char c); int ft_putnbr(int n); size_t ft_strlen(const char *s); diff --git a/ft_printf.o b/ft_printf.o new file mode 100644 index 0000000000000000000000000000000000000000..5b996fb425f4ca29bc3e26597f93adc0cb4c28bb GIT binary patch literal 3584 zcmcIn;cHt}6u&Q-T{qXgTBZmU$p<_7*cQ`Tw^oN{>)v*eZj@nNMaTM*zM8NmDam`b z4uh2}(nkmk#z5E?{{j_@(n}MH~rr?%l<7Rh+E$&iW8*;GzY+N{i1Ui#oqjXORUs`g%cM&y{>j3!;vbtu5;7 z$jfDGdnOMR^jfYIn$aK8qW)+WOKmCX%tHdD42f1R1J#+o^ULz`GF88sr*qZ7T-DDj zDNyNb&AGqD?aa^p<#)<+6`xX8O4^)r-zl?V524t@Cl!OD(vsJxV^?N$vGD0^t;24+ z+W~78Z@F?E8UuL7eh)fPDUjUStCO#wNehFmF65M`Ql^EWN};XzPBR+L-qiyxC)`Yn zlws6CA2gxf!Ifif?x=lX2XYsP`eR8-{yVfB79O{nU>vpI-H{Sf{wr>Nd*?F;+{_bC zqvb!r-aVR!3?&W()?>U=-U)Qu6QiZM_F zPJV)^;uNT>B`ct6`n0N@y{2kIU#Z%~Z&l4Ksam3}YIa4{vVSk;L%?i?yo>oButHd& zsJBul-wRV(%nzb+@?lVmc?u&ifIPshm1&q3*px=$ZsghGl(Kr89PhCEa?GPNCcrVK z#T&Q)_~3}I0IRWjaNCG2yeFo=T2k{7NM2wmmlisc@o|lWrbwu(`?a3ej~?soGa}JZ zb4&tGoa{fPpC;r?fBzeS&QoS2ZX^R;-NEi)=tx(O#!YMiAqQMVlq=_nGS#ZI@7vvc z4Nmk+fa8M_!{NmK)-QbhEls{CFkIhp#6fQ1Q1^db_kV~u$j|t-7JmPN4+)t2Q*?sp zP;b*8R#*b&d3-?XF7kkFpx5hf_=`h`pRnJME%X+cwMl&Tj)1)gPwN(@J9&8<{4n5{ zN5r#U0QM%w+i}4ltOuaa!P6-J``h5rZSVx(SoaS<7$B^NXpC8xCerbwH5QCA+qR6+ z(KMM%$1Rfs$w)e4WTcrro=SdHkBp|0ADih+JeB19Xv|1+Gh+!0lGG!{2x-UKAh^}I zq;)v6D4hs`?1Be(LEuLb1QC4HDE+Q_jE{Xo5qzDAR_3&3=^DrAXadAIJJh-?Y(;i%$YZAjXe;gNn6T33xDm9>DT@S04a*?GNG3yq>6AN(rV#_H;g!!aX99TZ*$D~fh`-3eG*AZ^uCV+@@g=Y<8In2IS z=s(DDzO4u`iFxV@+*=>NW0>>5#&Oo^y}2q%(w>-T{VG5qb8ewhEiW(XqJ-uQn2Rpnb? literal 0 HcmV?d00001 diff --git a/ft_putchar.c b/ft_putchar.c index 5921424..7436489 100644 --- a/ft_putchar.c +++ b/ft_putchar.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/18 10:49:00 by adjoly #+# #+# */ -/* Updated: 2023/11/20 15:51:04 by adjoly ### ########.fr */ +/* Updated: 2023/11/22 11:07:22 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/ft_putchar.o b/ft_putchar.o new file mode 100644 index 0000000000000000000000000000000000000000..bcef31d76bbefcb1afbe7b37332e94fbf5db7ed1 GIT binary patch literal 1264 zcmb_cJ4*vW5T1(?-x9?_QSd5JF^drkv5=D(4I&Cc3afaD7vdvP?pBO87J?W-@aKq) zg&_Jv1Pcr8ECM={+cE2LHsS}f-^{o3xSKpqQ!9%R!vKZ>bI^!b1$fg$t1es62_2A0 zSD({oud(XKMXHv*O4V*DF!_8W;et8XV`U9$eVU!Vy~vx zXQ4KL77J@qklBMnnJ?O|$U`H5BX?Um0K=-L8JVp1>BCfd1exp`!aFWWI|ss(uFpmG zTxZV~(y2%gTeh@8iO{si7r&%f3uu$FpG zqUqrIrY@q-^O +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/10/31 11:52:46 by adjoly #+# #+# */ -/* Updated: 2023/11/20 16:00:22 by adjoly ### ########.fr */ +/* Updated: 2023/11/22 10:51:24 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,7 +20,7 @@ int ft_putnbr(int n) len = 0; if (n < 0) { - write(1, "-", 1); + len += write(1, "-", 1); nbr = -n; } else diff --git a/ft_putnbr.o b/ft_putnbr.o new file mode 100644 index 0000000000000000000000000000000000000000..393d1442f1dd68b0975a133822b27934ee52d4ce GIT binary patch literal 1648 zcmbtTL2DC16n>l3)M}$q1PfKzlUQt)qthE_ck->WLP}tgUP)2z3+Q(X5Qw7`S3wV(?FO8 zciMT`BgDs7#W+xuph5|wfrw&L%oh_!Qy5Q}|$PhpD!R*00}p zGOKo8PtF)KMk1cPImKPP-X*#tn)ZAFv{Fo)93MTsi@u#{5R(VX-qOZ1FQ0LZEDU_ubXPrx z7&@ngaHmhBcicC8Bi}~wmrfz@^*)Su8OC2pIOPQYn}o}CbdFPBS_3nRTRG3pfKl|^ z{=OnS*IBm>&nbCeJheR=j7+fzhFj8JwugAo@Zt_Ina0Q|ARi1_QWHIHsQS zG1t#3dhz}OUO*>kes6d|F(;ZIX@y?k)JE-%5Nz}QyA+_E#YKHo{TO2E>=1$pUi2yj UlBv&f0dqn6Ph4+HT5?tWA72&S7ytkO literal 0 HcmV?d00001 diff --git a/ft_putnbrbase.c b/ft_putnbrbase.c index 9d15ba8..7e3073a 100644 --- a/ft_putnbrbase.c +++ b/ft_putnbrbase.c @@ -6,16 +6,16 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/11/18 10:57:44 by adjoly #+# #+# */ -/* Updated: 2023/11/20 16:16:34 by adjoly ### ########.fr */ +/* Updated: 2023/11/22 13:21:55 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ #include "ft_printf.h" -int ft_putnbrbase(int n, char *base) +int ft_putnbrbase(unsigned long int n, char *base) { - int base_len; - int len; + unsigned long int base_len; + int len; len = 0; base_len = (int)ft_strlen(base); diff --git a/ft_putnbrbase.o b/ft_putnbrbase.o new file mode 100644 index 0000000000000000000000000000000000000000..1cff54ca5ba10b6528698b493fff17c6970794f4 GIT binary patch literal 1520 zcmb`H&1(}u6u{r4we_P)6c2?K+>=5EwTW?--5dwOMCoc>2y~#{FSylw`!P|N7H}7Ni?Xa)>ySGb>ffWWf z;K;KSU{E@;Yuc>A6r6&FP~XIxAD&Pz`$DyQdwxc{V$1Idwb$47JE8mmlD@d^57H`G z+j`?yn{ZFC{cY+g)b1x*b(Y%M@-w!t{OtSkXolL+NorT9uR4_Z*=WSyYhvv$pJAz9 zU-T~Bio*3E_9|6gPrBf@$81Yj?gfpyAkW@_?y7Y{j$oRs7vJ#L;Uzb(~I zPn14j1c73q_Zx?w2SvMM1(QFEf#)2qdm+1kS}rIu_XiHEa^-1T#$gf$X~dhOK6$B3 zHli4wCF?R8)~E90Mze#VGzg*)KZa`gYqUv-kD*%ro*+s--qRF-u9b7O0C@VmC4&%G znGDx8YbDV}z-82tz#j)P03N0(@aAT#6~)NnO&Rf}dyV;22F)kHb$GP4vYG@fe53y( z9+shRIFTz?Grs*kcAH{dnL&qUQF9^M(`E>d3_pP@<=U$>ZTLmQX~wQ(uH)GG{+Dr& zYW{0}1#_w90;(&vzvn`+59!3t0 GeEx67O}q5~ literal 0 HcmV?d00001 diff --git a/ft_putstr.o b/ft_putstr.o new file mode 100644 index 0000000000000000000000000000000000000000..ecfa1a3b6a87bc6fdfd4271e97de54f72ebfa08f GIT binary patch literal 1488 zcmbtS&ubGw6n>l3)*p?grC^~7iw8-;j!o&I_E1ve+Bt}aLhx8NaZ8K&p}Ui|3Z;h> zArv8hM*o5$1yK;x-ue#+UW9;Nya(!gn>ThctQUPSJKy`>`{uo!H+$ZrhbhMaZ4NBK zxu;oxPU;*NVpxC-j6zAazsuH7SGIS%pS>PMWNWtz&EoMe;Wrmzs{QFbo!TYmEd_oo z9(X-jIh6-qS30N16qROH%j-D0puFkV-Ta)G z6SFh<`Dun!Y=S;$&Z|{$cCyaY=*Yzm7Q2BQEwU~8EMLvOP8Bo5sTY_*M6ywzL-6Y? zDVk2aIe;|8moOm7pf_&h$2}l-9anZBlbv<7_PnVg6^aV{!LS`}s(>zVsK~WuDG4Mh+mNmo?>=aaUn~-_R%ws=iRcjso%2S3Zbx6oCjEeW%i> z)q*<4>J1f$mB*!-Ncoj#m_V{%V{JY3YwHpeXRMU*;jhR+pN8huKQLbrI=+Ipi zOcL=IPL#}F#+@krR3@3f%{u-`{nEn4_7)#RUxGCSz614Td0otC8^Z)<= literal 0 HcmV?d00001 diff --git a/ft_strlen.o b/ft_strlen.o new file mode 100644 index 0000000000000000000000000000000000000000..6b9b640e89525589a0bc650171dc610336685007 GIT binary patch literal 1136 zcmbtSJ4*vW5S~jyd_NHsVi7AN=wgC`Sjb5{bBI`of{o}Uo<#Ccax17H7K#wkr1WQ4 zSqm0g=1&L#EBk=XTy`(ZqKyvhJiht9o!#5Ju{PI3h5^zHSbuh^;;4fAvq*f*4?JEex@DH@eneM72#!Q3v-GHE~s& z!h*1{3Sxey)w0y})7YT*`m25xwX~;xPB}l0J=NrV85glBbCp+D3nkaN8$wU-t(w#? zsUYV1ziA;B!DZr7%@l(s1V}o1BdM1-(e&9Qc_W8*=zD-3jP#9ly~G7A2njKNJV4rs Ue*Y1K^|vGDo*?eDWr5fA-_svcE&u=k literal 0 HcmV?d00001 diff --git a/libftprintf.a b/libftprintf.a new file mode 100644 index 0000000000000000000000000000000000000000..20a55e9fcb5ed65921eece17aed40b4264a5706e GIT binary patch literal 11218 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