diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-25 01:44:50 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-25 01:44:50 +0300 |
| commit | 58a75bb18b2a4080c8fae77024afed37f1be1314 (patch) | |
| tree | 4d9d65f5747636d6dea9295e79464108df24a9a2 /mysys | |
| parent | 99b79db5dca6909456a40d859298ba3992b145da (diff) | |
| parent | a82671178919afba86ddfdf2b64321eb9afff8e5 (diff) | |
| download | mariadb-git-58a75bb18b2a4080c8fae77024afed37f1be1314.tar.gz | |
Automerge with 5.1
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_getwd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysys/my_getwd.c b/mysys/my_getwd.c index e6b867e2753..a18c296a7e1 100644 --- a/mysys/my_getwd.c +++ b/mysys/my_getwd.c @@ -51,7 +51,7 @@ int my_getwd(char * buf, size_t size, myf MyFlags) (long) buf, (uint) size, MyFlags)); if (size < 1) - return(-1); + DBUG_RETURN(-1); if (curr_dir[0]) /* Current pos is saved here */ VOID(strmake(buf,&curr_dir[0],size-1)); @@ -59,12 +59,12 @@ int my_getwd(char * buf, size_t size, myf MyFlags) { #if defined(HAVE_GETCWD) if (size < 2) - return(-1); + DBUG_RETURN(-1); if (!getcwd(buf,(uint) (size-2)) && MyFlags & MY_WME) { my_errno=errno; my_error(EE_GETWD,MYF(ME_BELL+ME_WAITTANG),errno); - return(-1); + DBUG_RETURN(-1); } #elif defined(HAVE_GETWD) { @@ -74,12 +74,12 @@ int my_getwd(char * buf, size_t size, myf MyFlags) } #elif defined(VMS) if (size < 2) - return(-1); + DBUG_RETURN(-1); if (!getcwd(buf,size-2,1) && MyFlags & MY_WME) { my_errno=errno; my_error(EE_GETWD,MYF(ME_BELL+ME_WAITTANG),errno); - return(-1); + DBUG_RETURN(-1); } intern_filename(buf,buf); #else |