Move offset_1st_component() to path.c

The implementation is also lightly modified to use is_dir_sep() instead of hardcoding '/'. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Nguyễn Thái Ngọc Duy committed Feb 16, 2010 at 12:22 UTC 4bb43de25977063187dedf054122985bc5a2660e

3 files changed +8 -7

cache.h

@@ -664,6 +664,7 @@ int normalize_path_copy(char *dst, const char *src);

664 int longest_ancestor_length(const char *path, const char *prefix_list);

665 char *strip_path_suffix(const char *path, const char *suffix);

666 int daemon_avoid_alias(const char *path);

667 +int offset_1st_component(const char *path);

668

669 /* Read and unpack a sha1 file into memory, write memory to a sha1 file */

670 extern int sha1_object_info(const unsigned char *, unsigned long *);

path.c

@@ -649,3 +649,10 @@ int daemon_avoid_alias(const char *p)

649 }

650 }

651 }

652 +

653 +int offset_1st_component(const char *path)

654 +{

655 + if (has_dos_drive_prefix(path))

656 + return 2 + is_dir_sep(path[2]);

657 + return is_dir_sep(path[0]);

658 +}

sha1_file.c

-7

@@ -83,13 +83,6 @@ int get_sha1_hex(const char *hex, unsigned char *sha1)

83 return 0;

84 }

86 -static inline int offset_1st_component(const char *path)

87 -{

88 - if (has_dos_drive_prefix(path))

89 - return 2 + (path[2] == '/');

90 - return *path == '/';

91 -}

92 -

86 int safe_create_leading_directories(char *path)

87 {

88 char *pos = path + offset_1st_component(path);