X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=fd.c;h=fd6ef7dcbcac876dbf516a97cb9c0d5b25705cd1;hb=41c4262daac7908ad77896e862811c4b34fe0532;hp=cd5232caf1339a61ae8d9a397395fe07214b6892;hpb=3c96f3b4f7bb1be1c630085981e83eb0260b99a7;p=osl.git diff --git a/fd.c b/fd.c index cd5232c..fd6ef7d 100644 --- a/fd.c +++ b/fd.c @@ -125,11 +125,9 @@ out: * * \return Standard. */ -static int para_chdir(const char *path) +_static_inline_ int __chdir(const char *path) { - int ret = chdir(path); - - if (ret >= 0) + if (chdir(path) >= 0) return 1; return -ERRNO_TO_ERROR(errno); } @@ -168,7 +166,7 @@ int para_opendir(const char *dirname, DIR **dir, int *cwd) return ret; *cwd = ret; } - ret = para_chdir(dirname); + ret = __chdir(dirname); if (ret < 0) goto close_cwd; *dir = opendir("."); @@ -342,15 +340,11 @@ int truncate_file(const char *path, off_t size) ret = osl_stat(path, &statbuf); if (ret < 0) - goto out; + return ret; ret = -E_OSL_BAD_SIZE; if (statbuf.st_size < size) - goto out; - ret = -E_OSL_TRUNC; + return ret; if (truncate(path, statbuf.st_size - size) < 0) - goto out; - ret = 1; -out: - return ret; + return -ERRNO_TO_ERROR(errno); + return 1; } -