[syslinux:multifs] Move partiter from com32/chain to com32/lib/ syslinux
syslinux-bot for Raphael S. Carvalho
raphael.scarv at gmail.com
Mon Feb 1 03:18:04 PST 2016
Commit-ID: b5ff74ae43ec48da32f220ec677f586ac9221856
Gitweb: http://www.syslinux.org/commit/b5ff74ae43ec48da32f220ec677f586ac9221856
Author: Raphael S. Carvalho <raphael.scarv at gmail.com>
AuthorDate: Fri, 18 Oct 2013 01:52:47 -0300
Committer: Paulo Alcantara <pcacjr at zytor.com>
CommitDate: Sun, 31 Jan 2016 18:35:19 -0200
Move partiter from com32/chain to com32/lib/syslinux
multifs depends on the availability of partiter to find a partition.
Cc: Gene Cumm <gene.cumm at gmail.com>
Signed-off-by: Raphael S. Carvalho <raphael.scarv at gmail.com>
Signed-off-by: Paulo Alcantara <pcacjr at zytor.com>
---
com32/chain/Makefile | 2 +-
com32/chain/chain.c | 4 ++--
com32/chain/mangle.c | 4 ++--
com32/chain/mangle.h | 2 +-
com32/chain/options.c | 4 ++--
com32/{chain => include/syslinux}/partiter.h | 0
com32/{chain => include/syslinux}/utility.h | 3 ++-
com32/{chain => lib/syslinux}/partiter.c | 6 +++---
com32/{chain => lib/syslinux}/utility.c | 2 +-
mk/lib.mk | 2 +-
10 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/com32/chain/Makefile b/com32/chain/Makefile
index d7b5aa8..a7d1f66 100644
--- a/com32/chain/Makefile
+++ b/com32/chain/Makefile
@@ -16,7 +16,7 @@
VPATH = $(SRC)
include $(MAKEDIR)/elf.mk
-OBJS = chain.o partiter.o utility.o options.o mangle.o
+OBJS = chain.o options.o mangle.o
CFLAGS += -fno-strict-aliasing
all: chain.c32
diff --git a/com32/chain/chain.c b/com32/chain/chain.c
index 4e9e32d..f9fe07e 100644
--- a/com32/chain/chain.c
+++ b/com32/chain/chain.c
@@ -35,9 +35,9 @@
#include <syslinux/disk.h>
#include <syslinux/video.h>
#include "chain.h"
-#include "utility.h"
+#include <syslinux/utility.h>
#include "options.h"
-#include "partiter.h"
+#include <syslinux/partiter.h>
#include "mangle.h"
static int fixed_cnt = 128; /* see comments in main() */
diff --git a/com32/chain/mangle.c b/com32/chain/mangle.c
index 275d0aa..64d9c19 100644
--- a/com32/chain/mangle.c
+++ b/com32/chain/mangle.c
@@ -37,8 +37,8 @@
#include <syslinux/config.h>
#include "chain.h"
#include "options.h"
-#include "utility.h"
-#include "partiter.h"
+#include <syslinux/utility.h>
+#include <syslinux/partiter.h>
#include "mangle.h"
static const char cmldr_signature[8] = "cmdcons";
diff --git a/com32/chain/mangle.h b/com32/chain/mangle.h
index 42f6c5b..98b2f2c 100644
--- a/com32/chain/mangle.h
+++ b/com32/chain/mangle.h
@@ -32,7 +32,7 @@
#define COM32_CHAIN_MANGLE_H
#include "chain.h"
-#include "partiter.h"
+#include <syslinux/partiter.h>
/* file's manglers */
int manglef_isolinux(struct data_area *data);
diff --git a/com32/chain/options.c b/com32/chain/options.c
index e9c4a62..f63450f 100644
--- a/com32/chain/options.c
+++ b/com32/chain/options.c
@@ -33,8 +33,8 @@
#include <stdlib.h>
#include <string.h>
#include "chain.h"
-#include "partiter.h"
-#include "utility.h"
+#include <syslinux/partiter.h>
+#include <syslinux/utility.h>
#include "options.h"
struct options opt;
diff --git a/com32/chain/partiter.h b/com32/include/syslinux/partiter.h
similarity index 100%
rename from com32/chain/partiter.h
rename to com32/include/syslinux/partiter.h
diff --git a/com32/chain/utility.h b/com32/include/syslinux/utility.h
similarity index 97%
rename from com32/chain/utility.h
rename to com32/include/syslinux/utility.h
index f8e9c61..e2667a0 100644
--- a/com32/chain/utility.h
+++ b/com32/include/syslinux/utility.h
@@ -35,6 +35,7 @@
#include <stdio.h>
#include <syslinux/disk.h>
#include <syslinux/movebits.h>
+#include <klibc/compiler.h>
/* most (all ?) bpb "types" known to humankind as of 2012 */
enum {bpbUNK, bpbV20, bpbV30, bpbV32, bpbV34, bpbV40, bpbVNT, bpbV70, bpbEXF};
@@ -58,7 +59,7 @@ static inline int warn(const char *x)
return fprintf(stderr, "WARN: %s\n", x);
}
-static inline int error(const char *x)
+static __unusedfunc int error(const char *x)
{
return fprintf(stderr, "ERR: %s\n", x);
}
diff --git a/com32/chain/partiter.c b/com32/lib/syslinux/partiter.c
similarity index 99%
rename from com32/chain/partiter.c
rename to com32/lib/syslinux/partiter.c
index 4937f0c..3ae2583 100644
--- a/com32/chain/partiter.c
+++ b/com32/lib/syslinux/partiter.c
@@ -40,8 +40,8 @@
#include <stdarg.h>
#include <zlib.h>
#include <syslinux/disk.h>
-#include "partiter.h"
-#include "utility.h"
+#include <syslinux/partiter.h>
+#include <syslinux/utility.h>
#define ost_is_ext(type) ((type) == 0x05 || (type) == 0x0F || (type) == 0x85)
#define ost_is_nondata(type) (ost_is_ext(type) || (type) == 0x00)
@@ -407,7 +407,7 @@ static void gpt_conv_label(struct part_iter *iter)
iter->gpt.part_label[PI_GPTLABSIZE/2] = 0;
}
-static inline int valid_crc(uint32_t crc, const uint8_t *buf, unsigned int siz)
+static int valid_crc(uint32_t crc, const uint8_t *buf, unsigned int siz)
{
return crc == crc32(crc32(0, NULL, 0), buf, siz);
}
diff --git a/com32/chain/utility.c b/com32/lib/syslinux/utility.c
similarity index 99%
rename from com32/chain/utility.c
rename to com32/lib/syslinux/utility.c
index 180749e..ecf5a37 100644
--- a/com32/chain/utility.c
+++ b/com32/lib/syslinux/utility.c
@@ -38,7 +38,7 @@
#include <fs.h>
#include <syslinux/disk.h>
#include <syslinux/pmapi.h>
-#include "utility.h"
+#include <syslinux/utility.h>
static const char *bpbtypes[] = {
[0] = "unknown",
diff --git a/mk/lib.mk b/mk/lib.mk
index 7a48756..6897ef7 100644
--- a/mk/lib.mk
+++ b/mk/lib.mk
@@ -108,7 +108,7 @@ LIBOTHER_OBJS = \
pci/writeb.o pci/writew.o pci/writel.o \
\
sys/x86_init_fpu.o math/pow.o math/strtod.o \
- syslinux/disk.o \
+ syslinux/disk.o syslinux/utility.o syslinux/partiter.o \
\
syslinux/setup_data.o
More information about the Syslinux-commits
mailing list