From d043013fea859f5eb6f677cad28319d093f1dbda Mon Sep 17 00:00:00 2001 From: Chris Young Date: Thu, 14 Jun 2012 19:09:42 +0100 Subject: [PATCH] More changes resulting from pull request --- README.amiga | 4 ---- src/amiga/map.c | 7 ++----- src/netops.c | 2 +- src/path.c | 4 ++-- src/posix.h | 5 +++-- src/ppc/sha1ppc.S.obj | Bin 4471 -> 0 bytes 6 files changed, 8 insertions(+), 14 deletions(-) delete mode 100755 README.amiga delete mode 100644 src/ppc/sha1ppc.S.obj diff --git a/README.amiga b/README.amiga deleted file mode 100755 index 97414dda2f3..00000000000 --- a/README.amiga +++ /dev/null @@ -1,4 +0,0 @@ -Nasty build hack: -When setting SHA1 to ppc in CMakeLists.txt, after running initial CMake, -copy src/ppc/sha1ppc.S.obj to build/CMakeFiles/git2.dir/src/ppc/ -Add CMakeFiles/git2.dir/src/ppc/sha1ppc.S.obj to the list in build/CMakeFiles/git2.dir/link.txt diff --git a/src/amiga/map.c b/src/amiga/map.c index 643e6c65d14..2fb065c8b15 100755 --- a/src/amiga/map.c +++ b/src/amiga/map.c @@ -14,9 +14,6 @@ int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offset) { - int mprot = 0; - int mflag = 0; - GIT_MMAP_VALIDATE(out, len, prot, flags); out->data = NULL; @@ -27,12 +24,12 @@ int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offs return -1; } - if(out->data = malloc(len)) { + if((out->data = malloc(len))) { p_lseek(fd, offset, SEEK_SET); p_read(fd, out->data, len); } - if (!out->data || out->data == MAP_FAILED) { + if (!out->data || (out->data == MAP_FAILED)) { giterr_set(GITERR_OS, "Failed to mmap. Could not write data"); return -1; } diff --git a/src/netops.c b/src/netops.c index 166c9716263..98b5035ff5a 100644 --- a/src/netops.c +++ b/src/netops.c @@ -430,7 +430,7 @@ int gitno_connect(git_transport *t, const char *host, const char *port) #else memcpy(&hints.ai_addr.sin_addr, hints.ai_hostent->h_addr_list[p], hints.ai_hostent->h_length); hints.ai_addr.sin_family = hints.ai_hostent->h_addrtype; - hints.ai_addr.sin_port = honts.ai_port; + hints.ai_addr.sin_port = hints.ai_port; if (connect(s, (struct sockaddr *)&hints.ai_addr, sizeof(struct sockaddr_in)) == 0) #endif break; diff --git a/src/path.c b/src/path.c index bd659f815a9..1d85559a9f5 100644 --- a/src/path.c +++ b/src/path.c @@ -516,7 +516,7 @@ int git_path_direach( de_buf = git__malloc(sizeof(struct dirent)); #endif - while (p_readdir_r(dir, de_buf, de) == 0 && de != NULL) { + while (p_readdir_r(dir, de_buf, &de) == 0 && de != NULL) { int result; if (is_dot_or_dotdot(de->d_name)) @@ -574,7 +574,7 @@ int git_path_dirload( path_len -= prefix_len; need_slash = (path_len > 0 && path[path_len-1] != '/') ? 1 : 0; - while ((error = p_readdir_r(dir, de_buf, de)) == 0 && de != NULL) { + while ((error = p_readdir_r(dir, de_buf, &de)) == 0 && de != NULL) { char *entry_path; size_t entry_len; diff --git a/src/posix.h b/src/posix.h index cc35c52e3b5..d423b7e0743 100644 --- a/src/posix.h +++ b/src/posix.h @@ -84,9 +84,10 @@ extern int p_gettimeofday(struct timeval *tv, struct timezone *tz); #endif #ifndef NO_READDIR_R -#define p_readdir_r(d,e,r) readdir_r(d,e,&r) +#define p_readdir_r(d,e,r) readdir_r(d,e,r) #else -GIT_INLINE(int) p_readdir_r(DIR *dirp, struct dirent *entry, struct direct **result) +#include +GIT_INLINE(int) p_readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result) { GIT_UNUSED(entry); *result = readdir(dirp); diff --git a/src/ppc/sha1ppc.S.obj b/src/ppc/sha1ppc.S.obj deleted file mode 100644 index a7dad600fee80b062086f352aa62b87b1755e7ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4471 zcma)=L1-M;8ONU$(Qct&8Rnpp9Aq%mD}s?i3S(o;Vv-_;QdAMGL6_KT2aHUUAn7o1 zXLc*qml#7q=u*>zBjVBu48h<-)P|}eY(WPfL{TX%LD0}W|Nrm%wuyRZ z1*>@)y*E3*|NDOP-fr*JAN}yy$gwp1IhHcCzjk8G{`ImBr_;C7=*Gz}KltdqH2V9i zDOJCF?l-H~QaXQcVXgPCFUr+hX|(s}&&%F#KPy+?PmRm>-}zPV-G7#=AE)p37XMyW z{e`SLoGI($GkMh?$>v+9FU&WeUa0yvvnowytDmMZp05U-tWL9KJvEzGgOTjD9rP>E zZ?L9*YoiH$MzXrGnAHyl$Z1;pq#n^`Bm-8@H|BsWi^>b#p1JTX|XS=Xu@4 z`zG`opkH&{`n{4~;Q6}1eeAT#>ho4!7w9*E_idnGao74?OA|a_^>H8M$c}PsTEAQA zlyTfPjvpN5*s^}_r_;u33<$~bTzDJ?nQWX`ZUVL*qDilw;rey^_uw$95);8@r|Mw*{UXch%{iGw4nuL(iZ+jWNn#Nf~tK$ciz@pgU)IFoW(KGDHUF@4fjq=FpzQ zIP|-G|Fiex+hI|5myNkf7tyv{m_>Ja%W^>$?PYSUA&0rLyJ5Ul!q^SVggJCKkR#Zc zLwkcvsQZbR%I+g$tvL3P<)I87ZCg#C4%&~%gZgisE4v5AStX1;uq?!Xfc(JB8fYJo z13vEHo}U?Gl`!_1@?KgXFFXNnO;0ed9=anbLu6X4L=9Ij0gp8PLIpVx@r0Va9mwp5<{Rm$Ap*CwBepG{f@yZS7l^f10 zH=LJl)D3t6-Wpy6FTDs}dZ9KwhZl7dPH=wdg!9S?=amyNzjUHlwE3kE&MP0BS3Wo| zeW?0yf%Oa*f|o7?FI@;;dQc5+T0OJ=omchmysCfaW&PI;)IWGx|G~@p4_?-P@T&fs zsDJXZ{)3nGAH1yp;AQ<6>&DCam$ScoUNubzf|(8kGaR^l{}2DD`taazCZ`AFQwH$B zGQjfy9z+Ihd4PK1dOO$z|7xd1U8Vm=72Sx9bMHn3&4x1$kBT@WL{| z_25NhVqT#BxgIy+M=Q_e2e_Gy{7^Qy9{uoa%nx(DF0iicw6KO4JDry&s)-!uk*Vin zp5Q+5tgHI)1-a0d$c4T{F7zdGF<&B=J>?>AJQsQ6xyT#O#k`4J;16=4KamUliCpMU zo{RkQT;!MMVtz#~@C>!^`A{X;4a#>R@^38LRZ=Q>M z^IXig$mO=>Lhm9MdKbCSyU0b};XYL_@Q=B`zhN$LZ zXQ~B^<$C3{AkUmv`?x;*0x$gvUanWcOTU7bepQ1-@yaXbl~>Lyubfx=w+4Iyul8=v ztG%1^YVYQ}+P5{~5qRa1^U5RVl}FAikBT*WCUCuSUiss^^2d4UPt}Jv>rz!+GV0 z^U9B6OT6;JdF6%k$_wYE7gZlVfR{c5FMSAJx)8i{A-|Pc)nHr9^f#D;m&dw+ng^qO z{-h&wLq4+AP1HD;>~kmok9v0=xm@gvfzP9uvtfPW-g{rZl=VJ2m-RlnnDu^LWWArw zWf#-aTYtpo@DK5MJU^LcfBf?_kCCk&D_7E)&hql` zWB>orcpiQDy}-A;FTN2te$U%H#CHZKz5Sg1@AzNrIQ$*`zK=5vy#80e6aVSMYv_6} zvgJQ