From: Andre Noll <maan@tuebingen.mpg.de>
Date: Tue, 8 Dec 2015 06:39:04 +0000 (+0100)
Subject: Merge branch 'refs/heads/t/strerror'
X-Git-Tag: v0.5.6~91
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=030a9d5c9fe28328d5db977bf2c8ddbf7302673d;hp=2975726ce97716b97565b065b725f979dad92a88

Merge branch 'refs/heads/t/strerror'

Was cooking in next since 2015-09-27.

* refs/heads/t/strerror:
  error.h: Never call (para_)strerror() on osl errors.
  Clarify para_strerror().
  error.h: Remove is_errno().
---

diff --git a/afs.c b/afs.c
index bd705050..46af53f8 100644
--- a/afs.c
+++ b/afs.c
@@ -693,7 +693,7 @@ static int make_database_dir(void)
 
 	get_database_dir();
 	ret = para_mkdir(database_dir, 0777);
-	if (ret >= 0 || is_errno(-ret, EEXIST))
+	if (ret >= 0 || ret == -ERRNO_TO_PARA_ERROR(EEXIST))
 		return 1;
 	return ret;
 }
diff --git a/error.h b/error.h
index 5d5666c6..40e097e3 100644
--- a/error.h
+++ b/error.h
@@ -579,20 +579,8 @@ extern const char **para_errlist[];
 /** Set the osl error bit for the given number. */
 #define OSL_ERRNO_TO_PARA_ERROR(num) ((num) | (1 << OSL_ERROR_BIT))
 
-/** Check whether a given number is a system error number.
- *
- * \param num The value to be checked.
- * \param _errno The system error number.
- *
- * \return True if \a num is paraslash's representation of the system
- * error identified by \a _errno.
- */
-_static_inline_ bool is_errno(int num, int _errno)
-{
-	assert(num > 0 && _errno > 0);
-	return ERRNO_TO_PARA_ERROR(_errno) == num;
-}
 
+static const char *weak_osl_strerror(int) __attribute__ ((weakref("osl_strerror")));
 /**
  * Paraslash's version of strerror(3).
  *
@@ -603,12 +591,12 @@ _static_inline_ bool is_errno(int num, int _errno)
 _static_inline_ const char *para_strerror(int num)
 {
 	assert(num > 0);
-#ifdef _OSL_H
-	if (IS_OSL_ERROR(num))
-		return osl_strerror(num & ((1 << OSL_ERROR_BIT) - 1));
-#endif
+	if (IS_OSL_ERROR(num)) {
+		assert(weak_osl_strerror);
+		return weak_osl_strerror(num & ~(1U << OSL_ERROR_BIT));
+	}
 	if (IS_SYSTEM_ERROR(num))
-		return strerror(num & ((1 << SYSTEM_ERROR_BIT) - 1));
+		return strerror(num & ~(1U << SYSTEM_ERROR_BIT));
 	return para_errlist[ERRNUM_TO_SS(num)][ERRNUM_TO_INDEX(num)];
 }