mass redigest and update
This commit is contained in:
15
sys-fs/reiser4progs/files/reiser4progs-1.0.7-gcc-4.4.patch
Normal file
15
sys-fs/reiser4progs/files/reiser4progs-1.0.7-gcc-4.4.patch
Normal file
@@ -0,0 +1,15 @@
|
||||
http://bugs.gentoo.org/269240
|
||||
|
||||
fix build failure when using gcc-4.4
|
||||
|
||||
--- reiser4progs-1.0.7/plugin/node/node40/node40.c
|
||||
+++ reiser4progs-1.0.7/plugin/node/node40/node40.c
|
||||
@@ -994,7 +994,7 @@
|
||||
func = cb_comp_key3;
|
||||
#elif defined(ENABLE_LARGE_KEYS)
|
||||
func = cb_comp_key4;
|
||||
-#elif
|
||||
+#else
|
||||
func = NULL;
|
||||
#endif
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
--- reiser4progs-1.0.7/libreiser4/profile.c~ 2009-01-08 22:34:27.000000000 +0100
|
||||
+++ reiser4progs-1.0.7/libreiser4/profile.c 2011-01-07 01:28:39.509867695 +0100
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
|
||||
#include <reiser4/libreiser4.h>
|
||||
-#include <misc/misc.h>
|
||||
+#define INVAL_DIG (0x7fffffff)
|
||||
|
||||
/* All default plugin ids. This is used for getting plugin id if it cannot be
|
||||
obtained by usual way (get from disk structures, etc.). All these may be
|
||||
@@ -327,6 +327,25 @@
|
||||
}
|
||||
}
|
||||
|
||||
+#include <stdlib.h>
|
||||
+#include <errno.h>
|
||||
+/* Converts passed @sqtr into long long value. In the case of error, INVAL_DIG
|
||||
+ will be returned. */
|
||||
+static long long misc_str2long(const char *str, int base) {
|
||||
+ char *error;
|
||||
+ long long result = 0;
|
||||
+
|
||||
+ if (!str)
|
||||
+ return INVAL_DIG;
|
||||
+
|
||||
+ result = strtol(str, &error, base);
|
||||
+
|
||||
+ if (errno == ERANGE || *error)
|
||||
+ return INVAL_DIG;
|
||||
+
|
||||
+ return result;
|
||||
+}
|
||||
+
|
||||
/* Overrides plugin id by @id found by @name. */
|
||||
errno_t reiser4_profile_override(const char *slot, const char *name) {
|
||||
reiser4_plug_t *plug;
|
||||
Reference in New Issue
Block a user