diff options
| author | Timo Hirvonen <tihirvon@ee.oulu.fi> | 2005-06-07 20:35:56 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-07 13:44:11 -0700 |
| commit | 972d1bb067d0cea6334da081f6a3e2a6bad6f20b (patch) | |
| tree | 6e507a205f57cc069357c25bf6d068d7d8a47f28 | |
| parent | c859600954df4c292ec7c81d7f2f9d0a62b5975b (diff) | |
| download | git-972d1bb067d0cea6334da081f6a3e2a6bad6f20b.tar.gz git-972d1bb067d0cea6334da081f6a3e2a6bad6f20b.tar.xz | |
[PATCH] Use ntohs instead of htons to convert ce_flags to host byte order
Use ntohs instead of htons to convert ce_flags to host byte order
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | read-cache.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/read-cache.c b/read-cache.c index bfdaee02a..0d949f691 100644 --- 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]; - 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) return next; 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 */ len = ep - pathbuf; pos = cache_name_pos(pathbuf, - htons(create_ce_flags(len, 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 @@ -230,7 +230,7 @@ static int check_file_directory_conflict(const struct cache_entry *ce, * a directory there? */ 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() * should have taken care of that case. @@ -279,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; - 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 */ 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 (!ok_to_replace) 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; } |