Mercurial > code
changeset 57:311eaa9d004c
Renamed pack_* fonction for our guidelines
author | David Demelier <markand@malikania.fr> |
---|---|
date | Wed, 09 Nov 2011 18:35:35 +0100 |
parents | 770737295987 |
children | 669f2734557d |
files | pack.c pack.h |
diffstat | 2 files changed, 26 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/pack.c Tue Nov 08 18:26:05 2011 +0100 +++ b/pack.c Wed Nov 09 18:35:35 2011 +0100 @@ -293,20 +293,20 @@ */ int -pack(int ptype, const char *path, const char *fmt, ...) +pack_write(int ptype, const char *path, const char *fmt, ...) { va_list ap; int status; va_start(ap, fmt); - status = vpack(ptype, path, fmt, ap); + status = pack_vwrite(ptype, path, fmt, ap); va_end(ap); return status; } int -vpack(int ptype, const char *path, const char *fmt, va_list ap) +pack_vwrite(int ptype, const char *path, const char *fmt, va_list ap) { FILE *fp; int status; @@ -314,7 +314,7 @@ if ((fp = fopen(path, "w+b")) == NULL) return -1; - status = vfpack(ptype, fp, fmt, ap); + status = pack_vfwrite(ptype, fp, fmt, ap); fclose(fp); return status; @@ -326,20 +326,20 @@ */ int -fpack(int ptype, FILE *fp, const char *fmt, ...) +pack_fwrite(int ptype, FILE *fp, const char *fmt, ...) { va_list ap; int status; va_start(ap, fmt); - status = vfpack(ptype, fp, fmt, ap); + status = pack_vfwrite(ptype, fp, fmt, ap); va_end(ap); return status; } int -vfpack(int ptype, FILE *fp, const char *fmt, va_list ap) +pack_vfwrite(int ptype, FILE *fp, const char *fmt, va_list ap) { struct item_list list; int status; @@ -368,20 +368,20 @@ */ int -unpack(int ptype, const char *path, const char *fmt, ...) +pack_read(int ptype, const char *path, const char *fmt, ...) { va_list ap; int status; va_start(ap, fmt); - status = vunpack(ptype, path, fmt, ap); + status = pack_vread(ptype, path, fmt, ap); va_end(ap); return status; } int -vunpack(int ptype, const char *path, const char *fmt, va_list ap) +pack_vread(int ptype, const char *path, const char *fmt, va_list ap) { FILE *fp; int status; @@ -389,7 +389,7 @@ if ((fp = fopen(path, "rb")) == NULL) return -1; - status = vfunpack(ptype, fp, fmt, ap); + status = pack_vfread(ptype, fp, fmt, ap); fclose(fp); return status; @@ -397,20 +397,20 @@ } int -funpack(int ptype, FILE *fp, const char *fmt, ...) +pack_fread(int ptype, FILE *fp, const char *fmt, ...) { va_list ap; int status; va_start(ap, fmt); - status = vfunpack(ptype, fp, fmt, ap); + status = pack_vfread(ptype, fp, fmt, ap); va_end(ap); return status; } int -vfunpack(int ptype, FILE *fp, const char *fmt, va_list ap) +pack_vfread(int ptype, FILE *fp, const char *fmt, va_list ap) { const char *p; void *ptr;
--- a/pack.h Tue Nov 08 18:26:05 2011 +0100 +++ b/pack.h Wed Nov 09 18:35:35 2011 +0100 @@ -29,17 +29,17 @@ #undef PACK_HOST_BYTEORDER -#define PACK_LIL_ENDIAN 1234 -#define PACK_BIG_ENDIAN 4321 +#define PACK_LE 1234 +#define PACK_BE 4321 #if defined(__hppa__) || \ defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \ (defined(__MIPS__) && defined(__MISPEB__)) || \ defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \ defined(__sparc__) -# define PACK_HOST_BYTEORDER PACK_BIG_ENDIAN +# define PACK_HOST_BYTEORDER PACK_BE #else -# define PACK_HOST_BYTEORDER PACK_LIL_ENDIAN +# define PACK_HOST_BYTEORDER PACK_LE #endif #define pack_swap16(x) \ @@ -54,15 +54,15 @@ ((uint32_t) pack_swap32((uint32_t) (((x) << 32) >> 32))) << 32) \ | (uint32_t) pack_swap32((uint32_t) ((x) >> 32))) -int pack(int, const char *, const char *, ...); -int vpack(int, const char *, const char *, va_list); -int vfpack(int, FILE *, const char *, va_list); -int fpack(int, FILE *, const char *, ...); +int pack_write(int, const char *, const char *, ...); +int pack_vwrite(int, const char *, const char *, va_list); +int pack_fwrite(int, FILE *, const char *, ...); +int pack_vfwrite(int, FILE *, const char *, va_list); -int unpack(int, const char *, const char *, ...); -int vunpack(int, const char *, const char *, va_list); -int funpack(int, FILE *, const char *, ...); -int vfunpack(int, FILE *, const char *, va_list); +int pack_read(int, const char *, const char *, ...); +int pack_vread(int, const char *, const char *, va_list); +int pack_fread(int, FILE *, const char *, ...); +int pack_vfread(int, FILE *, const char *, va_list); #ifdef __cplusplus }