From 78e96be2b59ea39f4c9aba385c3e64324202f124 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Sun, 16 Jul 2006 14:53:40 +0200
Subject: [RELEASE] flxutils-0.1.24

---
 flx/ChangeLog |  2 ++
 flx/Makefile  |  6 ++++--
 flx/arg.c     |  2 +-
 flx/main.c    | 15 +++++++++------
 flx/utils.h   |  6 +++---
 5 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'flx')

diff --git a/flx/ChangeLog b/flx/ChangeLog
index 5397930..0e71676 100644
--- a/flx/ChangeLog
+++ b/flx/ChangeLog
@@ -1,3 +1,5 @@
+2004/11/21 : Version 0.6.8
+- now compiles with gcc-3.3
 2003/06/05 : Version 0.6.7
 - segfault on /proc directory : size_t -> ssize_t
 2003/01/04 : Version 0.6.6c
diff --git a/flx/Makefile b/flx/Makefile
index 0da663e..0a92cdc 100644
--- a/flx/Makefile
+++ b/flx/Makefile
@@ -26,15 +26,17 @@
 
 
 NAME=flx
-VERSION=0.6.7
+VERSION=0.6.8
 SRC=main.c arg.c utils.c md5.c flx.c fct1.c check.c sign.c \
     input.c input_fs.c input_file.c \
     output.c output_file.c
 OBJ=$(SRC:.c=.o)
-COPTS="-O2"
+COPTS=-O2
 CFLAGS= -Wall $(COPTS) -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\"
 LDFLAGS=-L.
 
+all:	$(NAME)
+
 $(NAME): $(OBJ)
 	$(CC) -o $(NAME) $(OBJ) $(LDFLAGS) 
 #	strip -R .note -R .comment signfs
diff --git a/flx/arg.c b/flx/arg.c
index 224607f..d82d2d1 100644
--- a/flx/arg.c
+++ b/flx/arg.c
@@ -30,7 +30,7 @@ void arg_usage(t_param *p, char *message, ...) {
     fprintf(stderr, "%s %s, %s\n", PROGRAM_NAME, PROGRAM_VERSION, COPYRIGHT);
     fprintf(stderr, "usage: %s [options] [...]\n", Progname);
     while(p && p->optnum) {
-	fprintf(stderr, "     %s\n", p->help);
+	fprintf(stderr, "\t%s\n", p->help);
 	p++;
     }
     exit(1);
diff --git a/flx/main.c b/flx/main.c
index dedfd73..7d82047 100644
--- a/flx/main.c
+++ b/flx/main.c
@@ -36,12 +36,15 @@ char  *Progname = NULL;
 
 
 t_param FLX_poptions[] = {
-    { 0, NULL, 0xFFFF, 0, "sign -h|<options> input [...]
-                  sign data" },
-    { 0, NULL, 0xFFFF, 0, "check -h|<options>  src1 src2                
-                  check difference between src1 and src2" },
-    { 0, NULL, 0xFFFF, 0, "check -h|<options>  src1 [...] , src2 [...]  
-                  check difference between srcs1 and srcs2" },
+    { 0, NULL, 0xFFFF, 0,
+      "sign\t-h|<options> input [...]\n"
+      "\t\tsign data" },
+    { 0, NULL, 0xFFFF, 0,
+      "check\t-h|<options>  src1 src2\n"
+      "\t\tcheck difference between src1 and src2" },
+    { 0, NULL, 0xFFFF, 0,
+      "check\t-h|<options>  src1 [...] , src2 [...]\n"
+      "\t\tcheck difference between srcs1 and srcs2" },
     { 0, NULL, 0, 0}
 };
 
diff --git a/flx/utils.h b/flx/utils.h
index 5c47333..17c1991 100644
--- a/flx/utils.h
+++ b/flx/utils.h
@@ -56,7 +56,7 @@ typedef unsigned char   u_char;
 
 #define BUFFLEN BUFFER_LENGTH
 
-#define PFERROR(str...)    PFERROR2(##str, 0)
+#define PFERROR(str...)    PFERROR2(str, 0)
 #define PFERROR2(str, p...)  pferror("%s:%d: " str, __FILE__, __LINE__, ##p)
 #define HEXTODEC(a)  (('0'<=(a) && (a)<='9')?(a)-'0':(a)-'a'+10)
 
@@ -71,7 +71,7 @@ typedef unsigned char   u_char;
 #define POOL_ALLOC(type) ({                     \
     void *p;                                    \
     if ((p = pool_##type) == NULL)              \
-        p = malloc(sizeof(##type));              \
+        p = malloc(sizeof(type));              \
     else {                                      \
         pool_##type = *(void **)pool_##type;    \
     }                                           \
@@ -94,7 +94,7 @@ typedef unsigned char   u_char;
 #define POOL_INIT_PROTO(type) extern type *pool_##type
 
 #else
-#define POOL_ALLOC(type) (calloc(1,sizeof(##type)));
+#define POOL_ALLOC(type) (calloc(1,sizeof(type)));
 #define POOL_FREE(type, ptr) (free(ptr));
 #define POOL_INIT        
 #endif  /* MEM_OPTIM */
-- 
cgit v1.2.3