Refactor of macros

Author: Piloalucard

src/libltfs/uthash.h

@@ -46,17 +46,11 @@
 #ifndef LTFS_UTHASH_H
 #define LTFS_UTHASH_H
 
-
-#ifndef HASH_NONFATAL_OOM
-#define HASH_NONFATAL_OOM 1
-#endif
-
-/* Include official uthash.h from submodule */
-#include "uthash_submodule/src/uthash.h"
-/* The modifications for LTFS */
+ /* The modifications for LTFS first */
 #include "uthash_ext.h"
+ /* Include official uthash.h from submodule */
+#include "uthash_submodule/src/uthash.h"
 
 
 #endif /* LTFS_UTHASH_H */
 
-// Made with Bob

src/libltfs/uthash_ext.h

@@ -46,11 +46,17 @@
 #ifndef __uthash_ext_h
 #define __uthash_ext_h
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/* Define OOM handling macros before including uthash */
+#undef HASH_NONFATAL_OOM
+#define HASH_NONFATAL_OOM 1
+
+#undef uthash_nonfatal_oom
+#define uthash_nonfatal_oom() do { errno=ENOMEM; } while (0)
+
 #define HASH_FIND_PARTIAL(structure,start,length,table,search,result)	\
 do {																	\
 	structure *s, *tmp;													\
@@ -63,10 +69,6 @@ do {																	\
 	}																	\
 } while (0)
 
-
-#undef HASH_RECORD_OOM
-#define HASH_RECORD_OOM(oomed) do { (oomed) = 1; errno=ENOMEM; } while (0)
-
 #ifdef __cplusplus
 }
 #endif