diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-07 10:29:49 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-07 10:29:49 +0000 |
commit | 48ad25568f0dfd937303cae0221a5818a0a609b3 (patch) | |
tree | 6f12ceba770283aaaf5101aef4ce52c81f4b288b /dir.c | |
parent | 10e74f035f4c89246389de654f21a5f9b82ed95c (diff) | |
download | ruby-48ad25568f0dfd937303cae0221a5818a0a609b3.tar.gz |
dir.c: use macros
* dir.c (replace_real_basename): use macros for getattrlist
buffer.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dir.c')
-rw-r--r-- | dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -81,7 +81,6 @@ char *strchr(char*,char); # define USE_NAME_ON_FS 1 # define RUP32(size) ((size)+3/4) # define SIZEUP32(type) RUP32(sizeof(type)) -# define NEXT(var) var = (void *)((ptr += SIZEUP32(var)) - SIZEUP32(var)) #else # define USE_NAME_ON_FS 0 #endif @@ -91,6 +90,7 @@ char *strchr(char*,char); #else # define NORMALIZE_UTF8PATH 0 #endif + #if NORMALIZE_UTF8PATH #include <sys/param.h> #include <sys/mount.h> @@ -1354,7 +1354,7 @@ join_path(const char *path, long len, int dirsep, const char *name, size_t namle static char * replace_real_basename(char *path, long base, int norm_p) { - u_int32_t attrbuf[(sizeof(attrreference_t) + MAXPATHLEN * 3 + sizeof(u_int32_t) - 1) / sizeof(u_int32_t) + 1]; + u_int32_t attrbuf[SIZEUP32(attrreference_t) + RUP32(MAXPATHLEN * 3) + 1]; struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, ATTR_CMN_NAME}; const attrreference_t *ar = (void *)(attrbuf+1); const char *name; |