fexc: use script_bin.o

Makefile

@@ -17,7 +17,8 @@ $(TOOLS): Makefile common.h
 fex2bin bin2fex: fexc
 	ln -s $< $@
 
-fexc: script.h script.c
+fexc: script.h script.c \
+	script_bin.h script_bin.c
 
 %: %.c %.h
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.c,$^) $(LIBS)

fexc.c

@@ -41,21 +41,6 @@ static int script_parse_fex(FILE *UNUSED(in), const char *UNUSED(filename),
 	return 0;
 }
 
-static size_t script_bin_size(struct script *UNUSED(script),
-			      size_t *UNUSED(sections),
-			      size_t *UNUSED(entries))
-{
-	return 0;
-}
-
-static int script_generate_bin(void *UNUSED(bin), size_t UNUSED(bin_size),
-			       struct script *UNUSED(script),
-			       size_t UNUSED(sections),
-			       size_t UNUSED(entries))
-{
-	return 0;
-}
-
 /*
  */
 static inline int script_parse(enum script_format format,

fexc.h

@@ -22,5 +22,6 @@
 #include <stdint.h>
 
 #include "script.h"
+#include "script_bin.h"
 
 #endif

script_bin.c

@@ -32,8 +32,8 @@
 
 /**
  */
-size_t calculate_bin_size(struct script *script,
-			  size_t *sections, size_t *entries)
+size_t script_bin_size(struct script *script,
+		       size_t *sections, size_t *entries)
 {
 	size_t words = 0, bin_size = 0;
 	struct list_entry *ls, *le;
@@ -91,8 +91,9 @@ size_t calculate_bin_size(struct script *script,
 	return bin_size;
 }
 
-int generate_bin(void *bin, size_t UNUSED(bin_size), struct script *script,
-		 size_t sections, size_t entries)
+int script_generate_bin(void *bin, size_t UNUSED(bin_size),
+			struct script *script,
+			size_t sections, size_t entries)
 {
 	struct script_bin_head *head;
 	struct script_bin_section *section;

script_bin.h

@@ -17,9 +17,10 @@
 #ifndef _SUBXI_TOOLS_SCRIPT_BIN_H
 #define _SUBXI_TOOLS_SCRIPT_BIN_H
 
-size_t calculate_bin_size(struct script *script,
-			  size_t *sections, size_t *entries);
+size_t script_bin_size(struct script *script,
+		       size_t *sections, size_t *entries);
+
+int script_generate_bin(void *bin, size_t bin_size, struct script *script,
+			size_t sections, size_t entries);
 
-int generate_bin(void *bin, size_t bin_size, struct script *script,
-		 size_t sections, size_t entries);
 #endif