undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Use ntohs instead of htons to convert ce_flags to host byte order

Browse Source 
Use ntohs instead of htons to convert ce_flags to host byte order

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Timo Hirvonen 2005-06-07 20:35:56 +00:00 committed by Linus Torvalds
parent c859600954
commit 972d1bb067
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
read-cache.c
View File

@ -132,7 +132,7 @@ int cache_name_pos(const char *name, int namelen)
while (last > first) { while (last > first) {
int next = (last + first) >> 1; int next = (last + first) >> 1;
struct cache_entry *ce = active_cache[next]; struct cache_entry *ce = active_cache[next];
int cmp = cache_name_compare(name, namelen, ce->name, htons(ce->ce_flags)); int cmp = cache_name_compare(name, namelen, ce->name, ntohs(ce->ce_flags));
if (!cmp) if (!cmp)
return next; return next;
if (cmp < 0) { if (cmp < 0) {
@ -206,7 +206,7 @@ static int check_file_directory_conflict(const struct cache_entry *ce,
*ep = 0; /* first cut it at slash */ *ep = 0; /* first cut it at slash */
len = ep - pathbuf; len = ep - pathbuf;
pos = cache_name_pos(pathbuf, pos = cache_name_pos(pathbuf,
htons(create_ce_flags(len, stage))); ntohs(create_ce_flags(len, stage)));
if (0 <= pos) { if (0 <= pos) {
/* Our leading path component is registered as a file, /* Our leading path component is registered as a file,
* and we are trying to make it a directory. This is * and we are trying to make it a directory. This is
@ -230,7 +230,7 @@ static int check_file_directory_conflict(const struct cache_entry *ce,
* a directory there? * a directory there?
*/ */
pos = cache_name_pos(path, pos = cache_name_pos(path,
htons(create_ce_flags(namelen, stage))); ntohs(create_ce_flags(namelen, stage)));
/* (0 <= pos) cannot happen because add_cache_entry() /* (0 <= pos) cannot happen because add_cache_entry()
* should have taken care of that case. * should have taken care of that case.
@ -279,7 +279,7 @@ int add_cache_entry(struct cache_entry *ce, int option)
int pos; int pos;
int ok_to_add = option & ADD_CACHE_OK_TO_ADD; int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE; int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
pos = cache_name_pos(ce->name, htons(ce->ce_flags)); pos = cache_name_pos(ce->name, ntohs(ce->ce_flags));
/* existing match? Just replace it */ /* existing match? Just replace it */
if (pos >= 0) { if (pos >= 0) {
@ -307,7 +307,7 @@ int add_cache_entry(struct cache_entry *ce, int option)
if (check_file_directory_conflict(ce, ok_to_replace)) { if (check_file_directory_conflict(ce, ok_to_replace)) {
if (!ok_to_replace) if (!ok_to_replace)
return -1; return -1;
pos = cache_name_pos(ce->name, htons(ce->ce_flags)); pos = cache_name_pos(ce->name, ntohs(ce->ce_flags));
pos = -pos-1; pos = -pos-1;
} }