summaryrefslogtreecommitdiff
path: root/file_io/os2/open.c
diff options
context:
space:
mode:
authorwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2002-10-13 03:34:32 +0000
committerwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2002-10-13 03:34:32 +0000
commit39e6c89a0ed813124804a5812a2beb9e2d2c0199 (patch)
tree054d6eee47a9dc4ee92cc85789df40639cc24b81 /file_io/os2/open.c
parentd3285a12f0374e16754cfc5020b36ac786646676 (diff)
downloadlibapr-39e6c89a0ed813124804a5812a2beb9e2d2c0199.tar.gz
Prepare to eliminate a platform specific
#define APR_OS2_STATUS(e) (APR_FROM_OS_ERROR(e)) for the platform agnostic APR_FROM_OS_ERROR() macro. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63909 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io/os2/open.c')
-rw-r--r--file_io/os2/open.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/file_io/os2/open.c b/file_io/os2/open.c
index 07ebe666a..00fb44246 100644
--- a/file_io/os2/open.c
+++ b/file_io/os2/open.c
@@ -135,7 +135,7 @@ APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, const char *fname, apr
}
if (rv != 0)
- return APR_OS2_STATUS(rv);
+ return APR_FROM_OS_ERROR(rv);
dafile->isopen = TRUE;
dafile->fname = apr_pstrdup(pool, fname);
@@ -167,10 +167,10 @@ APR_DECLARE(apr_status_t) apr_file_close(apr_file_t *file)
status = APR_SUCCESS;
if (file->flags & APR_DELONCLOSE) {
- status = APR_OS2_STATUS(DosDelete(file->fname));
+ status = APR_FROM_OS_ERROR(DosDelete(file->fname));
}
} else {
- return APR_OS2_STATUS(rc);
+ return APR_FROM_OS_ERROR(rc);
}
}
@@ -185,7 +185,7 @@ APR_DECLARE(apr_status_t) apr_file_close(apr_file_t *file)
APR_DECLARE(apr_status_t) apr_file_remove(const char *path, apr_pool_t *pool)
{
ULONG rc = DosDelete(path);
- return APR_OS2_STATUS(rc);
+ return APR_FROM_OS_ERROR(rc);
}
@@ -203,7 +203,7 @@ APR_DECLARE(apr_status_t) apr_file_rename(const char *from_path, const char *to_
}
}
- return APR_OS2_STATUS(rc);
+ return APR_FROM_OS_ERROR(rc);
}