From 0f94380f7cb6e78eb694c96a9f94d508f85dffba Mon Sep 17 00:00:00 2001 From: Jack Halford Date: Sun, 19 Feb 2017 21:22:03 +0100 Subject: [PATCH] putnbr_hex instead of putaddr --- malloc/libft | 2 +- malloc/libft_malloc_x86_64_Darwin.so | Bin 13836 -> 13828 bytes malloc/src/error_lib.c | 2 +- malloc/src/free.c | 4 +++- malloc/src/get_zones.c | 2 -- malloc/src/node_lib.c | 4 ++-- malloc/src/show_alloc_mem.c | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/malloc/libft b/malloc/libft index 0ca8ca81..5e978382 160000 --- a/malloc/libft +++ b/malloc/libft @@ -1 +1 @@ -Subproject commit 0ca8ca817f32fc0345ef93ef74a3abe2583bd89c +Subproject commit 5e978382fff27082681383029d99f76ae5a25ddc diff --git a/malloc/libft_malloc_x86_64_Darwin.so b/malloc/libft_malloc_x86_64_Darwin.so index 0f30e1deef8e947ee01a727572bbc7346171f01f..181ae7e56dd39a29a77950e1935ac4eef86a35fa 100755 GIT binary patch delta 2041 zcmZ8heQZ-z6o0RDGG=E#wzV58ZDA}H7oZ&zHbYs*c=#k+{J<^&nM|gWg+UsVCPXPM z*^InA8lGH2K>k@sh%q4wRuU4jFF=NbD2n2YCe#?=mMx})0uL0F>l^6P_Bx_Af&Dd>@^{qs;YT;cgXuk@*JL+8!9gLw-)3@Z)(3OC>IK0Az%J5a zZWhC2kJ;-9UfXhiLFbCQBR`j~pkp_h7J{BJTS^4MLWa!?W(mS|@|!tW>Ic;#L*130 zU*s)Ghl>It30sR7o)JNzoRd@S1tnfkV!9gFW#wyH57`B$Wkt#MZ-rBnTtuE2}XoE9dAJmIF4I>8OQN*~0!-(5mq%&}C4!&H{F+*j?tJJW}I% zAfBMhEM$+(nFz>ATvuXwC6bdddbgC9o5rpCY8kr(Kzm+3B0qSj#`0=BrvR@qzDAX% z)&TXH>FH@XRkR2rsO?}IL2ih8Nme2g;HI`ufGcKV9bV~FV>uf6YkFFdzL)zi1Uk?6 z^dx$gSiJ)fOAsQm^1IwWWdp+7PXZy&3&KJ``VANiV}~(GHIk>RFm(R~Tj%-z`TGn< zxj(K8))e}TEQSXV(Vre;@SLHt1NvNWR2h@&Aa|vmW{X(>C|Z%ItV(nkrU{7vU_|{2 zvWKWXj7plVu9D^dqyYnUmUR3pCLOiaZ)4mzG?q_k2hg$p00T*uyU6nnM_CQn%*--} z^YWLFK1UV#!LcQQy(nc)aeZ9Mz);~cLu z`T}j`(K-yVfs2|UN)UmZwaz8?$`93J$8lab;?u|iSy4Bqn*bfP{fYVDB;PNB>a!n{ zp$cz8gCnGM3@zSdZaCCN!8%aMH5&4&0IC66298*TBKrrE0h8~9xwIApQ zoe@Ua$S9}I4l~bihNSCw9 zxt|M3_NwS*uV*)s{mvRw=lKJ!RrXDA>5OHNE(=>P&^Gd-tLX&~pnO$kN~d>lG^x=1 z*zW(B$=GI~y?lBIX?!;hF2pu6ys^=vpVch?`D*^>fIa$7&^b1VZ}1K>6e z)^d=-?G9iE2cIT8=AAVKb`rm5HyQPmS5?2(P``bBq_tIAzkY3`&A0XyNdl~CJGth$ zPEL5;rl>7_*}Khd(fq*Vv}Z_5&}$p4!}DT%EP+RkM1z+SIbS%?)uoBysL%IO z7!FZQ%!x@c1Hb4=@ub)l*2Jr#@DAJ_D5}ffL`L(`T%%$fqn>76mo_0f1 delta 2353 zcmZuzYitx%6rSk=N@=^h^hKY$QcxOdZ7T>(Q@aGl3<)Keh~XKCD8W#n3E700tSxQ{ z9fs9yt{73m4-g-LXi14L5L&vlO@9a~sZ}8?5%g}TxmW2fp&aHLI=N~J=6)7bIE-BUJKDM~REEo@;@ zovO2)NzURQuN2Kce0M>3_x`U7Ql5X~@0qaMDQIdc{@CfH8Hs9YKl?4IGM#djTIS6i zk0m=(S))CL@o5>U1Br^F`-1j$-K^bSoUk~9U9jiQw7XlQy1zbtMn#lyw^fT9o~Y@K z>c)56hPHJ>i?DlH`RuxVdghe`MG=m=>EXI@mIu?B-I1GcG@X??+_SgCYP;)+g57RJB(z5d{H`UbL2F+3~x-|sKxYJ6mGWdqOQ+8i5EY5KOR2=8Wcl|@`EHO z4gD#GHq5)?@p#w=i_aTVY<}doLUzCljfSCk$X3}oM~fNSP?(rD#nRM<3@wK6rc~SB ze5k(yg^F1ZH*WOpH|zQ6n9<8uq0ofony_3O9rK;7Fn;1`qF4xAy4H0E0)Z8}ab5Qf z5g>5)Fs3r(7MM&=lqZkFA|cxJkA;h*lZ49;=l|d$+j%(tKd#{kT*Ia|EO7x=(Ic=T zqWQ?^7?J_matm3R1U)3ILjsz+b--K^b=ywgHwO4Blzo7ZHD=~zZYMA_CD`8x?eEH| z>_BE7o0aJ*c>-$F8yO#qjHzO9CMW_+?32uGO>W&x{yvRT&|qQ6yn}}4qHbz~5c_(x zTS~7MbWjbSw@y9 zqAcM~K-B$O$gB?<{l2qtV+Gu9_AH(ks@b7$^aN>DK?_}tn5Yg`KEvLiwfR_FQ+I9Q?s+0d_#7$lTYm!-e|8jOnjIg40bPHgB*MhJRw6YBLe-kBT~U@ zse-@uPfIM9V#pGmqP{nZP~QEh>BKz*ietNJ6Z_DfwGvsVO0O1^#bf*jl;WyL6+`92 zF;S{PD)^M2ZJ3@wo@-nLYc1s!322Gy-&l^581q2gXFgkrW(G*IjDI8&zz( zl7T(^D!ZKRT)UjOGQFIRK2J=-Aj6@BZatAe1*GsSDbbLG_}lP-DZ&RN+Fi(PXqWiM zRLU2uz`+_nR_vV|S4tL9?oS_Kr*iUgZcvl{^h@HCeNKGleZg+zlq>@|lc~)&2^L*r zW}WVE7sgmC zd@Wm_TfL+lT1*>8e4Gk?Q}SL;dG--aAjCi=Z^)P|djarExFb=_A^L#az^>-zFTO3Z zN!m3Lszr@1<2-Mre*CpO-G37bK(Hhwo=eV zxpys8z(l(M-9;^+D}+%Vgx5#;F-gKpq7mHE)}F5xah^fGR|Mgl`a12_2H{XoJYu(u zj)Cbl>fAeEl|N3Mg8^PNA|Tu)r9&!FvW_Q9{Wa1XBTUQhDapfHP9NPcz5MvF$Pwi$ zC7lueIV&$HYU1=$CZ<&SUA<%Z4T^;p5nUod-)&L*8~F2658LPp+xQGF04j4xdc8+p z?^<5w0{$yi_t(BfY8$QPDYQ9Re?j&1YB+{L8eLTp4A@*r;2*4@aFM!?tuI`v9%9D| z7pj}sUxg*=5;m=BItGOJn5NoXLd#bb8RpH*S;er}c-OKR_s2c)myGn9IZEVMKgF65bjnKo^ zSLIbIxl*8iZ)~tcvZU;^WW|z+6S4=`r&UfzbGGzaZD}jm&sBA5s3Y&`8wvjc+{EPX diff --git a/malloc/src/error_lib.c b/malloc/src/error_lib.c index 055c3abe..adcacf30 100644 --- a/malloc/src/error_lib.c +++ b/malloc/src/error_lib.c @@ -22,7 +22,7 @@ void error_free_notalloc(void *ptr) ft_putstr_fd(", ??? ", fd); ft_putstr_fd(")", fd); ft_putstr_fd(" malloc: error for object ", fd); - ft_putaddr_fd(ptr, fd); + ft_putnbr_hex_fd((long)ptr, fd); ft_putendl_fd(": pointer being freed was not allocated"FG_DEFAULT, fd); /* exit(134); */ } diff --git a/malloc/src/free.c b/malloc/src/free.c index c5f53356..7db65b74 100644 --- a/malloc/src/free.c +++ b/malloc/src/free.c @@ -41,12 +41,14 @@ void free(void *ptr) t_node *node; ft_putstr(FG_YELLOW"free("); - ft_putaddr(ptr); + ft_putnbr_hex((long)ptr); ft_putendl(")"FG_DEFAULT); if (!ptr) return ; node = ptr - HEADER_SIZE; get_zones(&zone_ref, &alloc_ref, node->size); + ft_putstr("zone @"); + *zone_ref ? print_node(BG_MAGENTA, *zone_ref) : ft_putendl(" NULL"); if (remove_node(alloc_ref, node)) { error_free_notalloc(ptr); diff --git a/malloc/src/get_zones.c b/malloc/src/get_zones.c index 52c1f65c..65ed3eab 100644 --- a/malloc/src/get_zones.c +++ b/malloc/src/get_zones.c @@ -31,6 +31,4 @@ void get_zones(t_node ***zone_ref, t_node ***alloc_ref, size_t size) *zone_ref = TINY(size) ? &tiny_zone : &small_zone; *alloc_ref = TINY(size) ? &tiny_alloc : &small_alloc; } - ft_putstr("zone @"); - **zone_ref ? print_node(BG_MAGENTA, **zone_ref) : ft_putendl(" NULL"); } diff --git a/malloc/src/node_lib.c b/malloc/src/node_lib.c index f1fe4216..80dfc51e 100644 --- a/malloc/src/node_lib.c +++ b/malloc/src/node_lib.c @@ -56,9 +56,9 @@ int remove_node(t_node **head, t_node *node) while (*head) { ft_putstr("looking for node; diff=["); - ft_putaddr(node); + ft_putnbr_hex((long)node); ft_putstr(","); - ft_putaddr(*head); + ft_putnbr_hex((long)*head); ft_putendl("]"); if (*head == node) { diff --git a/malloc/src/show_alloc_mem.c b/malloc/src/show_alloc_mem.c index ec7797e8..44b16495 100644 --- a/malloc/src/show_alloc_mem.c +++ b/malloc/src/show_alloc_mem.c @@ -23,9 +23,9 @@ void print_node(char color[7], t_node *node) { ft_putstr("\t"); ft_putstr(color); - ft_putaddr(node->data); + ft_putnbr_hex((long)node->data); ft_putstr(" - "); - ft_putaddr(node->data + node->size); + ft_putnbr_hex((long)node->data + node->size); ft_putstr(FBG_DEFAULT" : "); ft_putnbr(node->size); ft_putendl(" bytes");