Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
d043013f
Commit
d043013f
authored
Jun 14, 2012
by
Chris Young
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More changes resulting from pull request
parent
a8df98c6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
14 deletions
+8
-14
README.amiga
+0
-4
src/amiga/map.c
+2
-5
src/netops.c
+1
-1
src/path.c
+2
-2
src/posix.h
+3
-2
src/ppc/sha1ppc.S.obj
+0
-0
No files found.
README.amiga
deleted
100755 → 0
View file @
a8df98c6
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
src/amiga/map.c
View file @
d043013f
...
@@ -14,9 +14,6 @@
...
@@ -14,9 +14,6 @@
int
p_mmap
(
git_map
*
out
,
size_t
len
,
int
prot
,
int
flags
,
int
fd
,
git_off_t
offset
)
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
);
GIT_MMAP_VALIDATE
(
out
,
len
,
prot
,
flags
);
out
->
data
=
NULL
;
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
...
@@ -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
;
return
-
1
;
}
}
if
(
out
->
data
=
malloc
(
len
))
{
if
(
(
out
->
data
=
malloc
(
len
)
))
{
p_lseek
(
fd
,
offset
,
SEEK_SET
);
p_lseek
(
fd
,
offset
,
SEEK_SET
);
p_read
(
fd
,
out
->
data
,
len
);
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"
);
giterr_set
(
GITERR_OS
,
"Failed to mmap. Could not write data"
);
return
-
1
;
return
-
1
;
}
}
...
...
src/netops.c
View file @
d043013f
...
@@ -430,7 +430,7 @@ int gitno_connect(git_transport *t, const char *host, const char *port)
...
@@ -430,7 +430,7 @@ int gitno_connect(git_transport *t, const char *host, const char *port)
#else
#else
memcpy
(
&
hints
.
ai_addr
.
sin_addr
,
hints
.
ai_hostent
->
h_addr_list
[
p
],
hints
.
ai_hostent
->
h_length
);
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_family
=
hints
.
ai_hostent
->
h_addrtype
;
hints
.
ai_addr
.
sin_port
=
h
o
nts
.
ai_port
;
hints
.
ai_addr
.
sin_port
=
h
i
nts
.
ai_port
;
if
(
connect
(
s
,
(
struct
sockaddr
*
)
&
hints
.
ai_addr
,
sizeof
(
struct
sockaddr_in
))
==
0
)
if
(
connect
(
s
,
(
struct
sockaddr
*
)
&
hints
.
ai_addr
,
sizeof
(
struct
sockaddr_in
))
==
0
)
#endif
#endif
break
;
break
;
...
...
src/path.c
View file @
d043013f
...
@@ -516,7 +516,7 @@ int git_path_direach(
...
@@ -516,7 +516,7 @@ int git_path_direach(
de_buf
=
git__malloc
(
sizeof
(
struct
dirent
));
de_buf
=
git__malloc
(
sizeof
(
struct
dirent
));
#endif
#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
;
int
result
;
if
(
is_dot_or_dotdot
(
de
->
d_name
))
if
(
is_dot_or_dotdot
(
de
->
d_name
))
...
@@ -574,7 +574,7 @@ int git_path_dirload(
...
@@ -574,7 +574,7 @@ int git_path_dirload(
path_len
-=
prefix_len
;
path_len
-=
prefix_len
;
need_slash
=
(
path_len
>
0
&&
path
[
path_len
-
1
]
!=
'/'
)
?
1
:
0
;
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
;
char
*
entry_path
;
size_t
entry_len
;
size_t
entry_len
;
...
...
src/posix.h
View file @
d043013f
...
@@ -84,9 +84,10 @@ extern int p_gettimeofday(struct timeval *tv, struct timezone *tz);
...
@@ -84,9 +84,10 @@ extern int p_gettimeofday(struct timeval *tv, struct timezone *tz);
#endif
#endif
#ifndef NO_READDIR_R
#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
#else
GIT_INLINE
(
int
)
p_readdir_r
(
DIR
*
dirp
,
struct
dirent
*
entry
,
struct
direct
**
result
)
#include <dirent.h>
GIT_INLINE
(
int
)
p_readdir_r
(
DIR
*
dirp
,
struct
dirent
*
entry
,
struct
dirent
**
result
)
{
{
GIT_UNUSED
(
entry
);
GIT_UNUSED
(
entry
);
*
result
=
readdir
(
dirp
);
*
result
=
readdir
(
dirp
);
...
...
src/ppc/sha1ppc.S.obj
deleted
100644 → 0
View file @
a8df98c6
File deleted
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment