projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Anal retentive 'const unsigned char *sha1'
[git.git]
/
read-cache.c
diff --git
a/read-cache.c
b/read-cache.c
index
34c040a
..
0d949f6
100644
(file)
--- a/
read-cache.c
+++ b/
read-cache.c
@@
-132,7
+132,7
@@
int cache_name_pos(const char *name, int namelen)
while (last > first) {
int next = (last + first) >> 1;
struct cache_entry *ce = active_cache[next];
while (last > first) {
int next = (last + first) >> 1;
struct cache_entry *ce = active_cache[next];
- int cmp = cache_name_compare(name, namelen, ce->name,
hton
s(ce->ce_flags));
+ int cmp = cache_name_compare(name, namelen, ce->name,
ntoh
s(ce->ce_flags));
if (!cmp)
return next;
if (cmp < 0) {
if (!cmp)
return next;
if (cmp < 0) {
@@
-200,11
+200,13
@@
static int check_file_directory_conflict(const struct cache_entry *ce,
cp = pathbuf;
while (1) {
char *ep = strchr(cp, '/');
cp = pathbuf;
while (1) {
char *ep = strchr(cp, '/');
+ int len;
if (!ep)
break;
*ep = 0; /* first cut it at slash */
if (!ep)
break;
*ep = 0; /* first cut it at slash */
+ len = ep - pathbuf;
pos = cache_name_pos(pathbuf,
pos = cache_name_pos(pathbuf,
-
htons(create_ce_flags(ep-cp
, stage)));
+
ntohs(create_ce_flags(len
, stage)));
if (0 <= pos) {
/* Our leading path component is registered as a file,
* and we are trying to make it a directory. This is
if (0 <= pos) {
/* Our leading path component is registered as a file,
* and we are trying to make it a directory. This is
@@
-228,7
+230,7
@@
static int check_file_directory_conflict(const struct cache_entry *ce,
* a directory there?
*/
pos = cache_name_pos(path,
* a directory there?
*/
pos = cache_name_pos(path,
-
hton
s(create_ce_flags(namelen, stage)));
+
ntoh
s(create_ce_flags(namelen, stage)));
/* (0 <= pos) cannot happen because add_cache_entry()
* should have taken care of that case.
/* (0 <= pos) cannot happen because add_cache_entry()
* should have taken care of that case.
@@
-277,7
+279,7
@@
int add_cache_entry(struct cache_entry *ce, int option)
int pos;
int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
int pos;
int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
- pos = cache_name_pos(ce->name,
hton
s(ce->ce_flags));
+ pos = cache_name_pos(ce->name,
ntoh
s(ce->ce_flags));
/* existing match? Just replace it */
if (pos >= 0) {
/* existing match? Just replace it */
if (pos >= 0) {
@@
-305,7
+307,7
@@
int add_cache_entry(struct cache_entry *ce, int option)
if (check_file_directory_conflict(ce, ok_to_replace)) {
if (!ok_to_replace)
return -1;
if (check_file_directory_conflict(ce, ok_to_replace)) {
if (!ok_to_replace)
return -1;
- pos = cache_name_pos(ce->name,
hton
s(ce->ce_flags));
+ pos = cache_name_pos(ce->name,
ntoh
s(ce->ce_flags));
pos = -pos-1;
}
pos = -pos-1;
}