gamin/gamin-fam_abi_compatibility_FamErrlist.patch

50 lines
1.4 KiB
Diff

---
libgamin/fam.h | 15 ++++++++++-----
libgamin/gam_api.c | 4 +++-
2 files changed, 13 insertions(+), 6 deletions(-)
Index: gamin-0.1.10/libgamin/fam.h
===================================================================
--- gamin-0.1.10.orig/libgamin/fam.h
+++ gamin-0.1.10/libgamin/fam.h
@@ -214,14 +214,19 @@ extern int FAMDebugLevel (FAMConnection
#define FAM_DEBUG_VERBOSE 2
/**
- * FamErrList:
- *
- * In case FAMErrno is set, FAMErrlist is a global string array indexed
- * by FAMErrno that describes the last error that happened.
+ * FamErrList: *unused* and empty.
* NOTE: this is not a good mechanism, it's present here only to provide
* API and ABI compatibility with FAM.
*/
-extern const char *FamErrlist[];
+extern char *FamErrlist[];
+
+/**
+ * FamGaminErrList:
+ *
+ * In case FAMErrno is set, FamGaminErrlist is a global string array indexed
+ * by FAMErrno that describes the last error that happened.
+ */
+extern const char *FamGaminErrlist[];
/**
* FAMNoExists:
Index: gamin-0.1.10/libgamin/gam_api.c
===================================================================
--- gamin-0.1.10.orig/libgamin/gam_api.c
+++ gamin-0.1.10/libgamin/gam_api.c
@@ -40,7 +40,9 @@ static enum {
FAM_UNIMPLEM/* Unimplemented */
} FAMError;
-const char *FamErrlist[] = {
+char* FamErrlist[1]; /* 1 = same size as FAM, for ABI compatibility */
+
+const char *FamGaminErrlist[] = {
"Okay",
"Bad arguments",
"Bad filename",