summaryrefslogtreecommitdiff
path: root/package/cfgfs
diff options
context:
space:
mode:
Diffstat (limited to 'package/cfgfs')
-rw-r--r--package/cfgfs/Makefile3
-rw-r--r--package/cfgfs/src/adler.h2
-rw-r--r--package/cfgfs/src/compress.c2
-rw-r--r--package/cfgfs/src/compress.h10
-rw-r--r--package/cfgfs/src/cpr_get.c4
-rw-r--r--package/cfgfs/src/defs.h7
-rw-r--r--package/cfgfs/src/ft_creat.c24
-rw-r--r--package/cfgfs/src/fts.c34
-rw-r--r--package/cfgfs/src/fts_gnu.h4
-rw-r--r--package/cfgfs/src/fts_subs.c2
-rw-r--r--package/cfgfs/src/fts_subs.h2
-rw-r--r--package/cfgfs/src/header.c9
-rw-r--r--package/cfgfs/src/minilzop.c22
-rw-r--r--package/cfgfs/src/minilzop.h2
-rw-r--r--package/cfgfs/src/pack.h18
-rw-r--r--package/cfgfs/src/sys_linux.c7
-rw-r--r--package/cfgfs/src/sysdeps.h8
-rw-r--r--package/cfgfs/src/tool.c2
-rw-r--r--package/cfgfs/src/unwraps.c14
-rw-r--r--package/cfgfs/src/wraps.c6
20 files changed, 73 insertions, 109 deletions
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index ddec3c779..159bd229b 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= cfgfs
PKG_VERSION:= 1.0.9
-PKG_RELEASE:= 5
+PKG_RELEASE:= 6
PKG_DESCR:= compressed config filesystem
PKG_SECTION:= base
PKG_URL:= http://openadk.org/
@@ -26,7 +26,6 @@ $(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
-
TARGET_LDFLAGS+= -static-libgcc
do-install:
diff --git a/package/cfgfs/src/adler.h b/package/cfgfs/src/adler.h
index a1608705f..751aa928d 100644
--- a/package/cfgfs/src/adler.h
+++ b/package/cfgfs/src/adler.h
@@ -45,7 +45,7 @@
by the 'buffer' argument, size expected in 'len'
which is TRASHED; stores the result in s1 and s2 */
#define ADLER_CALC(buffer) do { \
- const uint8_t *adler_buf = (const uint8_t *)(buffer); \
+ const u_int8_t *adler_buf = (const u_int8_t *)(buffer); \
while (len) { \
len -= (n = MIN(len, ADLER_NMAX)); \
while (n--) { \
diff --git a/package/cfgfs/src/compress.c b/package/cfgfs/src/compress.c
index b75959c4e..efec3ef8c 100644
--- a/package/cfgfs/src/compress.c
+++ b/package/cfgfs/src/compress.c
@@ -28,8 +28,6 @@
#include "defs.h"
#include "compress.h"
-__RCSID("$MirOS: contrib/hosted/fwcf/compress.c,v 1.7 2006/09/23 23:46:35 tg Exp $");
-
static void compress_initialise(void);
static fwcf_compressor *fwcf_compressors = NULL;
diff --git a/package/cfgfs/src/compress.h b/package/cfgfs/src/compress.h
index c421aca5c..413075d83 100644
--- a/package/cfgfs/src/compress.h
+++ b/package/cfgfs/src/compress.h
@@ -9,6 +9,8 @@
#ifndef COMPRESS_H
#define COMPRESS_H
+#include <sys/types.h>
+
/* BEGIN of plug-in API description - hook yer proprietary modules here */
/* returns 0 on success, -1 on failure */
@@ -28,25 +30,21 @@ typedef struct FWCF_COMPRESSOR {
fwcf_compress_work_func compress;
fwcf_compress_rev_func decompress;
const char *name;
- uint8_t code;
+ u_int8_t code;
} fwcf_compressor;
-__BEGIN_DECLS
/* 0=success 1=EINVAL 2=slot already used */
int compress_register(fwcf_compressor *);
-__END_DECLS
/* END of plug-in API description, version 1.0 */
-__BEGIN_DECLS
/* low-level */
fwcf_compressor *compress_enumerate(void);
int compress_list(void);
/* high-level */
-fwcf_compressor *compressor_get(uint8_t);
+fwcf_compressor *compressor_get(u_int8_t);
int compressor_getbyname(const char *);
int list_compressors(void);
-__END_DECLS
#endif
diff --git a/package/cfgfs/src/cpr_get.c b/package/cfgfs/src/cpr_get.c
index 71e414130..894abb347 100644
--- a/package/cfgfs/src/cpr_get.c
+++ b/package/cfgfs/src/cpr_get.c
@@ -29,10 +29,8 @@
#include "defs.h"
#include "compress.h"
-__RCSID("$MirOS: contrib/hosted/fwcf/cpr_get.c,v 1.4 2007/03/09 22:35:13 tg Exp $");
-
fwcf_compressor *
-compressor_get(uint8_t algo)
+compressor_get(u_int8_t algo)
{
fwcf_compressor *list;
diff --git a/package/cfgfs/src/defs.h b/package/cfgfs/src/defs.h
index b19046a27..c099ffb5a 100644
--- a/package/cfgfs/src/defs.h
+++ b/package/cfgfs/src/defs.h
@@ -18,13 +18,6 @@
#define __RCSID(x) static const char __rcsid[] __attribute__((used)) = (x)
#endif
-#ifndef BSD
-#define uint8_t u_int8_t
-#define uint16_t u_int16_t
-#define uint32_t u_int32_t
-#define uint64_t u_int64_t
-#endif
-
#ifndef __dead
#define __dead __attribute__((noreturn))
#endif
diff --git a/package/cfgfs/src/ft_creat.c b/package/cfgfs/src/ft_creat.c
index 5838f8647..4faf3c55c 100644
--- a/package/cfgfs/src/ft_creat.c
+++ b/package/cfgfs/src/ft_creat.c
@@ -35,12 +35,10 @@
#include "defs.h"
#include "pack.h"
-__RCSID("$MirOS: contrib/hosted/fwcf/ft_creat.c,v 1.2 2006/09/23 23:21:04 tg Exp $");
-
static size_t ft_creat(char *);
-static void make_directory(char *, uint32_t, uint32_t, uint32_t, time_t);
-static void make_file(char *, uint8_t *, size_t);
-static void make_symlink(char *, uint8_t *, size_t);
+static void make_directory(char *, u_int32_t, u_int32_t, u_int32_t, time_t);
+static void make_file(char *, u_int8_t *, size_t);
+static void make_symlink(char *, u_int8_t *, size_t);
static void pop_directories(void);
static void do_chown(char *, uid_t, gid_t);
static void do_chmod(char *, mode_t);
@@ -74,14 +72,14 @@ ft_creatm(char *buf, const char *pathname)
static size_t
ft_creat(char *buf)
{
- uint8_t c, *p;
+ u_int8_t c, *p;
char *fname;
size_t i, type = 0, size = 0;
- uint32_t x_uid = 0, x_gid = 0, x_mode = 0;
+ u_int32_t x_uid = 0, x_gid = 0, x_mode = 0;
time_t x_mtime = 0;
i = strlen(buf) + 1;
- p = (uint8_t *)buf + i;
+ p = (u_int8_t *)buf + i;
fname = pfxname(buf);
while (*p)
switch (c = *p++) {
@@ -183,11 +181,11 @@ ft_creat(char *buf)
if (type != 3)
free(fname);
- return ((p - (uint8_t *)buf) + size);
+ return ((p - (u_int8_t *)buf) + size);
}
static void
-make_directory(char *n, uint32_t m, uint32_t u, uint32_t g, time_t t)
+make_directory(char *n, u_int32_t m, u_int32_t u, u_int32_t g, time_t t)
{
struct a_directory *newdir;
@@ -209,7 +207,7 @@ make_directory(char *n, uint32_t m, uint32_t u, uint32_t g, time_t t)
}
static void
-make_file(char *n, uint8_t *buf, size_t len)
+make_file(char *n, u_int8_t *buf, size_t len)
{
int fd;
@@ -221,14 +219,14 @@ make_file(char *n, uint8_t *buf, size_t len)
}
if ((size_t)write(fd, buf, len) != len)
- warn("could not write %lu bytes", (u_long)len);
+ warn("could not write %lu bytes", (unsigned long)len);
if (close(fd))
warn("close");
}
static void
-make_symlink(char *n, uint8_t *buf, size_t len)
+make_symlink(char *n, u_int8_t *buf, size_t len)
{
char target[len + 1];
diff --git a/package/cfgfs/src/fts.c b/package/cfgfs/src/fts.c
index e271ed538..02d4bfea8 100644
--- a/package/cfgfs/src/fts.c
+++ b/package/cfgfs/src/fts.c
@@ -52,8 +52,6 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#include "defs.h"
-__RCSID("$MirOS: contrib/hosted/fwcf/fts.c,v 1.3 2007/07/02 14:50:21 tg Exp $");
-
#define internal_function
/* Largest alignment size needed, minus one.
@@ -67,15 +65,15 @@ __RCSID("$MirOS: contrib/hosted/fwcf/fts.c,v 1.3 2007/07/02 14:50:21 tg Exp $");
#endif
-static FTSENT *fts_alloc __P((FTS *, const char *, int)) internal_function;
-static FTSENT *fts_build __P((FTS *, int)) internal_function;
-static void fts_lfree __P((FTSENT *)) internal_function;
-static void fts_load __P((FTS *, FTSENT *)) internal_function;
-static size_t fts_maxarglen __P((char * const *)) internal_function;
-static void fts_padjust __P((FTS *, FTSENT *)) internal_function;
-static int fts_palloc __P((FTS *, size_t)) internal_function;
-static FTSENT *fts_sort __P((FTS *, FTSENT *, int)) internal_function;
-static u_short fts_stat __P((FTS *, FTSENT *, int)) internal_function;
+static FTSENT *fts_alloc (FTS *, const char *, int) internal_function;
+static FTSENT *fts_build (FTS *, int) internal_function;
+static void fts_lfree (FTSENT *) internal_function;
+static void fts_load (FTS *, FTSENT *) internal_function;
+static size_t fts_maxarglen (char * const *) internal_function;
+static void fts_padjust (FTS *, FTSENT *) internal_function;
+static int fts_palloc (FTS *, size_t) internal_function;
+static FTSENT *fts_sort (FTS *, FTSENT *, int) internal_function;
+static u_short fts_stat (FTS *, FTSENT *, int) internal_function;
static int fts_safe_changedir(FTS *, FTSENT *, int, char *);
#ifndef MAX
@@ -101,7 +99,7 @@ FTS *
fts_open(argv, options, compar)
char * const *argv;
register int options;
- int (*compar) __P((const FTSENT **, const FTSENT **));
+ int (*compar) (const FTSENT **, const FTSENT **);
{
register FTS *sp;
register FTSENT *p, *root;
@@ -119,7 +117,7 @@ fts_open(argv, options, compar)
if ((sp = malloc((u_int)sizeof(FTS))) == NULL)
return (NULL);
memset(sp, 0, sizeof(FTS));
- sp->fts_compar = (int (*) __P((const void *, const void *))) compar;
+ sp->fts_compar = (int (*) (const void *, const void *)) compar;
sp->fts_options = options;
/* Logical walks turn on NOCHDIR; symbolic links are too hard. */
@@ -694,11 +692,11 @@ fts_build(sp, type)
if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
continue;
- if ((p = fts_alloc(sp, dp->d_name, (int)_D_EXACT_NAMLEN (dp))) == NULL)
+ if ((p = fts_alloc(sp, dp->d_name, (int)strlen(dp->d_name))) == NULL)
goto mem1;
- if (_D_EXACT_NAMLEN (dp) >= maxlen) {/* include space for NUL */
+ if (strlen(dp->d_name) >= maxlen) {/* include space for NUL */
oldaddr = sp->fts_path;
- if (fts_palloc(sp, _D_EXACT_NAMLEN (dp) + len + 1)) {
+ if (fts_palloc(sp, strlen(dp->d_name) + len + 1)) {
/*
* No more memory for path or structures. Save
* errno, free up the current structure and the
@@ -723,7 +721,7 @@ mem1: saved_errno = errno;
maxlen = sp->fts_pathlen - len;
}
- if (len + _D_EXACT_NAMLEN (dp) >= USHRT_MAX) {
+ if (len + strlen(dp->d_name) >= USHRT_MAX) {
/*
* In an FTSENT, fts_pathlen is a u_short so it is
* possible to wraparound here. If we do, free up
@@ -740,7 +738,7 @@ mem1: saved_errno = errno;
}
p->fts_level = level;
p->fts_parent = sp->fts_cur;
- p->fts_pathlen = len + _D_EXACT_NAMLEN (dp);
+ p->fts_pathlen = len + strlen(dp->d_name);
#if defined FTS_WHITEOUT && 0
if (dp->d_type == DT_WHT)
diff --git a/package/cfgfs/src/fts_gnu.h b/package/cfgfs/src/fts_gnu.h
index 08d45a085..9cc6d4d38 100644
--- a/package/cfgfs/src/fts_gnu.h
+++ b/package/cfgfs/src/fts_gnu.h
@@ -123,15 +123,11 @@ typedef struct _ftsent {
char fts_name[1]; /* file name */
} FTSENT;
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
FTSENT *fts_children(FTS *, int);
int fts_close(FTS *);
FTS *fts_open(char * const *, int,
int (*)(const FTSENT **, const FTSENT **));
FTSENT *fts_read(FTS *);
int fts_set(FTS *, FTSENT *, int);
-__END_DECLS
#endif /* !_FTS_H_ */
diff --git a/package/cfgfs/src/fts_subs.c b/package/cfgfs/src/fts_subs.c
index ec40219f8..311048a26 100644
--- a/package/cfgfs/src/fts_subs.c
+++ b/package/cfgfs/src/fts_subs.c
@@ -37,8 +37,6 @@
#define FTSF_INTERNALS
#include "fts_subs.h"
-__RCSID("$MirOS: contrib/hosted/fwcf/fts_subs.c,v 1.8 2007/07/02 14:53:03 tg Exp $");
-
static FTS *handle;
char ftsf_prefix[PATH_MAX];
diff --git a/package/cfgfs/src/fts_subs.h b/package/cfgfs/src/fts_subs.h
index c7d2c10fc..b83616a87 100644
--- a/package/cfgfs/src/fts_subs.h
+++ b/package/cfgfs/src/fts_subs.h
@@ -27,11 +27,9 @@ typedef struct FTSF_ENTRY ftsf_entry;
extern const char ftsf_prefix[];
#endif
-__BEGIN_DECLS
void ftsf_start(const char *);
/* returns -1 on error, 0 on empty, 1 on okay */
int ftsf_next(ftsf_entry *);
void ftsf_debugent(ftsf_entry *);
-__END_DECLS
#endif
diff --git a/package/cfgfs/src/header.c b/package/cfgfs/src/header.c
index b3db0ce21..146b7ce39 100644
--- a/package/cfgfs/src/header.c
+++ b/package/cfgfs/src/header.c
@@ -33,12 +33,9 @@
#include "adler.h"
#include "pack.h"
-__RCSID("$MirOS: contrib/hosted/fwcf/header.c,v 1.7 2006/09/26 10:25:03 tg Exp $"
- "\t" ADLER_H);
-
char *
-mkheader(char *f_header, size_t hdrsize, uint32_t outer_len,
- uint32_t inner_len, uint8_t algo)
+mkheader(char *f_header, size_t hdrsize, u_int32_t outer_len,
+ u_int32_t inner_len, u_int8_t algo)
{
char *hdrptr = f_header;
size_t hdrleft = hdrsize;
@@ -68,7 +65,7 @@ mktrailer(char *data, size_t len)
size_t hdrleft = 4;
ADLER_DECL;
#ifdef DEBUG_ADLER
- uint32_t adler = adler32(1, (uint8_t *)data, len);
+ u_int32_t adler = adler32(1, (u_int8_t *)data, len);
#endif
ADLER_CALC(data);
diff --git a/package/cfgfs/src/minilzop.c b/package/cfgfs/src/minilzop.c
index 51935185c..6f0f6281b 100644
--- a/package/cfgfs/src/minilzop.c
+++ b/package/cfgfs/src/minilzop.c
@@ -32,19 +32,17 @@
#include "compress.h"
#include "minilzop.h"
-__RCSID("$MirOS: contrib/hosted/fwcf/minilzop.c,v 1.2 2007/03/09 22:25:45 tg Exp $");
-
#define lodsw(s) __extension__({ \
- const uint8_t *lodsw_buf = (const uint8_t *)(s);\
- uint16_t lodsw_val; \
+ const u_int8_t *lodsw_buf = (const u_int8_t *)(s);\
+ u_int16_t lodsw_val; \
\
lodsw_val = lodsw_buf[0]; \
lodsw_val |= lodsw_buf[1] << 8; \
(lodsw_val); \
})
#define lodsd(s) __extension__({ \
- const uint8_t *lodsd_buf = (const uint8_t *)(s);\
- uint32_t lodsd_val; \
+ const u_int8_t *lodsd_buf = (const u_int8_t *)(s);\
+ u_int32_t lodsd_val; \
\
lodsd_val = lodsd_buf[0]; \
lodsd_val |= lodsd_buf[1] << 8; \
@@ -53,15 +51,15 @@ __RCSID("$MirOS: contrib/hosted/fwcf/minilzop.c,v 1.2 2007/03/09 22:25:45 tg Exp
(lodsd_val); \
})
#define stosw(s,w) do { \
- uint8_t *stosw_buf = (uint8_t *)(s); \
- uint16_t stosw_val = (w); \
+ u_int8_t *stosw_buf = (u_int8_t *)(s); \
+ u_int16_t stosw_val = (w); \
\
stosw_buf[0] = stosw_val & 0xFF; \
stosw_buf[1] = (stosw_val >> 8) & 0xFF; \
} while (0)
#define stosd(s,dw) do { \
- uint8_t *stosd_buf = (uint8_t *)(s); \
- uint32_t stosd_val = (dw); \
+ u_int8_t *stosd_buf = (u_int8_t *)(s); \
+ u_int32_t stosd_val = (dw); \
\
stosd_buf[0] = stosd_val & 0xFF; \
stosd_buf[1] = (stosd_val >> 8) & 0xFF; \
@@ -73,7 +71,7 @@ void
read_aszdata(int dfd, char **dbuf, size_t *dlen)
{
size_t len;
- uint8_t hdrbuf[8];
+ u_int8_t hdrbuf[8];
ADLER_DECL;
if (read(dfd, hdrbuf, 8) != 8)
@@ -97,7 +95,7 @@ void
write_aszdata(int dfd, const char *dbuf, size_t dlen)
{
size_t len;
- uint8_t hdrbuf[8];
+ u_int8_t hdrbuf[8];
ADLER_DECL;
stosd(hdrbuf + 4, dlen);
diff --git a/package/cfgfs/src/minilzop.h b/package/cfgfs/src/minilzop.h
index 8c23c674e..9d0c37735 100644
--- a/package/cfgfs/src/minilzop.h
+++ b/package/cfgfs/src/minilzop.h
@@ -9,11 +9,9 @@
#ifndef MINILZOP_H
#define MINILZOP_H
-__BEGIN_DECLS
int minilzop(int ifd, int ofd, int compr_alg, int decompress);
/* TODO: use the two below for the “outer filesystem” as well */
void read_aszdata(int, char **, size_t *);
void write_aszdata(int, const char *, size_t);
-__END_DECLS
#endif
diff --git a/package/cfgfs/src/pack.h b/package/cfgfs/src/pack.h
index 9dfb8233f..7189994ba 100644
--- a/package/cfgfs/src/pack.h
+++ b/package/cfgfs/src/pack.h
@@ -9,6 +9,8 @@
#ifndef PACK_H
#define PACK_H
+#include <sys/types.h>
+
struct FTSF_ENTRY;
#ifndef FTS_SUBS_H
typedef struct FTSF_ENTRY ftsf_entry;
@@ -51,16 +53,16 @@ typedef struct FTSF_ENTRY ftsf_entry;
} while (0)
#define LOADW(x) __extension__({ \
- uint8_t *lwbf = (uint8_t *)(x); \
- uint32_t res = 0; \
+ u_int8_t *lwbf = (u_int8_t *)(x); \
+ u_int32_t res = 0; \
res = (res << 8) | lwbf[1]; \
res = (res << 8) | lwbf[0]; \
res; \
})
#define LOADT(x) __extension__({ \
- uint8_t *lwbf = (uint8_t *)(x); \
- uint32_t res = 0; \
+ u_int8_t *lwbf = (u_int8_t *)(x); \
+ u_int32_t res = 0; \
res = (res << 8) | lwbf[2]; \
res = (res << 8) | lwbf[1]; \
res = (res << 8) | lwbf[0]; \
@@ -68,8 +70,8 @@ typedef struct FTSF_ENTRY ftsf_entry;
})
#define LOADD(x) __extension__({ \
- uint8_t *lwbf = (uint8_t *)(x); \
- uint32_t res = 0; \
+ u_int8_t *lwbf = (u_int8_t *)(x); \
+ u_int32_t res = 0; \
res = (res << 8) | lwbf[3]; \
res = (res << 8) | lwbf[2]; \
res = (res << 8) | lwbf[1]; \
@@ -77,11 +79,10 @@ typedef struct FTSF_ENTRY ftsf_entry;
res; \
})
-__BEGIN_DECLS
char *ft_pack(ftsf_entry *);
char *ft_packm(void);
-char *mkheader(char *, size_t, uint32_t, uint32_t, uint8_t);
+char *mkheader(char *, size_t, u_int32_t, u_int32_t, u_int8_t);
char *mktrailer(char *, size_t);
void ft_dump(char *);
@@ -90,6 +91,5 @@ void ft_creatm(char *, const char *);
char *fwcf_unpack(int, size_t *);
char *fwcf_pack(char *, size_t, int, size_t *);
char *fwcf_packm(const char *, int, size_t *);
-__END_DECLS
#endif
diff --git a/package/cfgfs/src/sys_linux.c b/package/cfgfs/src/sys_linux.c
index 38283a44d..af730dd42 100644
--- a/package/cfgfs/src/sys_linux.c
+++ b/package/cfgfs/src/sys_linux.c
@@ -23,6 +23,7 @@
#include <err.h>
#include <fcntl.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -30,8 +31,6 @@
#include "defs.h"
#include "sysdeps.h"
-__RCSID("$MirOS: contrib/hosted/fwcf/sys_linux.c,v 1.3 2006/09/26 10:25:03 tg Exp $");
-
void
pull_rndata(uint8_t *buf, size_t n)
{
@@ -42,7 +41,7 @@ pull_rndata(uint8_t *buf, size_t n)
return;
}
if ((size_t)read(fd, buf, n) != n)
- warn("Cannot read %lu bytes from /dev/urandom", (u_long)n);
+ warn("Cannot read %lu bytes from /dev/urandom", (unsigned long)n);
close(fd);
}
@@ -56,6 +55,6 @@ push_rndata(uint8_t *buf, size_t n)
return;
}
if ((size_t)write(fd, buf, n) != n)
- warn("Cannot write %lu bytes to /dev/urandom", (u_long)n);
+ warn("Cannot write %lu bytes to /dev/urandom", (unsigned long)n);
close(fd);
}
diff --git a/package/cfgfs/src/sysdeps.h b/package/cfgfs/src/sysdeps.h
index 34313f58c..a38e6ee0d 100644
--- a/package/cfgfs/src/sysdeps.h
+++ b/package/cfgfs/src/sysdeps.h
@@ -9,9 +9,9 @@
#ifndef SYSDEPS_H
#define SYSDEPS_H
-__BEGIN_DECLS
-void pull_rndata(uint8_t *, size_t);
-void push_rndata(uint8_t *, size_t);
-__END_DECLS
+#include <sys/types.h>
+
+void pull_rndata(u_int8_t *, size_t);
+void push_rndata(u_int8_t *, size_t);
#endif
diff --git a/package/cfgfs/src/tool.c b/package/cfgfs/src/tool.c
index 3daf141cd..a9e475c4a 100644
--- a/package/cfgfs/src/tool.c
+++ b/package/cfgfs/src/tool.c
@@ -32,8 +32,6 @@
#include "minilzop.h"
#include "pack.h"
-__RCSID("$MirOS: contrib/hosted/fwcf/tool.c,v 1.7 2007/03/09 22:35:13 tg Exp $");
-
static __dead void usage(void);
static int mkfwcf(int, const char *, int);
static int unfwcf(int, const char *);
diff --git a/package/cfgfs/src/unwraps.c b/package/cfgfs/src/unwraps.c
index d03f297e3..51452a56e 100644
--- a/package/cfgfs/src/unwraps.c
+++ b/package/cfgfs/src/unwraps.c
@@ -41,7 +41,7 @@ __RCSID("$MirOS: contrib/hosted/fwcf/unwraps.c,v 1.10 2006/09/26 10:25:03 tg Exp
char *
fwcf_unpack(int fd, size_t *inner)
{
- uint8_t c, hdrbuf[12];
+ u_int8_t c, hdrbuf[12];
size_t outer, x_inner, x, len, maxln;
char *cdata, *udata;
ADLER_DECL;
@@ -77,19 +77,19 @@ fwcf_unpack(int fd, size_t *inner)
if ((s1 != LOADW(cdata + outer - 4)) ||
(s2 != LOADW(cdata + outer - 2)))
errx(1, "crc mismatch: %02X%02X%02X%02X != %04X%04X",
- (uint8_t)cdata[outer - 1], (uint8_t)cdata[outer - 2],
- (uint8_t)cdata[outer - 3], (uint8_t)cdata[outer - 4],
+ (u_int8_t)cdata[outer - 1], (u_int8_t)cdata[outer - 2],
+ (u_int8_t)cdata[outer - 3], (u_int8_t)cdata[outer - 4],
s2, s1);
if ((x = compressor_get(c)->decompress(udata, *inner, cdata + 12,
outer - 16)) != *inner)
- errx(1, "size mismatch: decompressed %lu, want %lu", (u_long)x,
- (u_long)*inner);
- push_rndata((uint8_t *)cdata + outer, maxln - outer);
+ errx(1, "size mismatch: decompressed %lu, want %lu", (unsigned long)x,
+ (unsigned long)*inner);
+ push_rndata((u_int8_t *)cdata + outer, maxln - outer);
free(cdata);
#ifdef DEBUG
fprintf(stderr, "fwcf_unpack: decompressed outer %lu inner %lu\n",
- (u_long)outer, (u_long)*inner);
+ (unsigned long)outer, (unsigned long)*inner);
#endif
return (udata);
}
diff --git a/package/cfgfs/src/wraps.c b/package/cfgfs/src/wraps.c
index 7923b76be..288f6dbab 100644
--- a/package/cfgfs/src/wraps.c
+++ b/package/cfgfs/src/wraps.c
@@ -67,9 +67,9 @@ fwcf_pack(char *odata, size_t i, int algo, size_t *dstsz)
char *data, *cdata;
if (i > 0xFFFFFF)
- errx(1, "inner size of %lu too large", (u_long)i);
+ errx(1, "inner size of %lu too large", (unsigned long)i);
#ifdef DEBUG
- fprintf(stderr, "fwcf_pack: algo %02X packing %lu\n", algo, (u_long)i);
+ fprintf(stderr, "fwcf_pack: algo %02X packing %lu\n", algo, (unsigned long)i);
#endif
if ((j = compressor_get(algo)->compress(&cdata, odata, i)) == -1)
@@ -92,6 +92,6 @@ fwcf_pack(char *odata, size_t i, int algo, size_t *dstsz)
data[k++] = 0;
mktrailer(data, k);
k += 4;
- pull_rndata((uint8_t *)data + k, *dstsz - k);
+ pull_rndata((u_int8_t *)data + k, *dstsz - k);
return (data);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-02 12:27:59 +0000