Fix up some signed char vs int issues that show up on powerpc.
This commit is contained in:
parent
1c1f5d3047
commit
5a9d441b2c
@ -804,7 +804,7 @@ extern int dpkg_main(int argc, char **argv)
|
|||||||
|
|
||||||
package_t *p, *packages = NULL;
|
package_t *p, *packages = NULL;
|
||||||
void *status = NULL;
|
void *status = NULL;
|
||||||
char opt = 0;
|
int opt = 0;
|
||||||
int optflag = 0;
|
int optflag = 0;
|
||||||
|
|
||||||
while ((opt = getopt(argc, argv, "iruc")) != -1) {
|
while ((opt = getopt(argc, argv, "iruc")) != -1) {
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
// if fn is NULL then input is stdin and output is stdout
|
// if fn is NULL then input is stdin and output is stdout
|
||||||
static int convert(char *fn, int ConvType) {
|
static int convert(char *fn, int ConvType) {
|
||||||
char c;
|
int c;
|
||||||
char *tempFn = NULL;
|
char *tempFn = NULL;
|
||||||
FILE *in = stdin, *out = stdout;
|
FILE *in = stdin, *out = stdout;
|
||||||
|
|
||||||
|
@ -244,7 +244,7 @@ void *md5_finish_ctx(struct md5_ctx *ctx, void *resbuf)
|
|||||||
/* Put the 64-bit file length in *bits* at the end of the buffer. */
|
/* Put the 64-bit file length in *bits* at the end of the buffer. */
|
||||||
*(md5_uint32 *) & ctx->buffer[bytes + pad] = SWAP(ctx->total[0] << 3);
|
*(md5_uint32 *) & ctx->buffer[bytes + pad] = SWAP(ctx->total[0] << 3);
|
||||||
*(md5_uint32 *) & ctx->buffer[bytes + pad + 4] =
|
*(md5_uint32 *) & ctx->buffer[bytes + pad + 4] =
|
||||||
SWAP((ctx->total[1] << 3) | (ctx->total[0] >> 29));
|
SWAP( ((ctx->total[1] << 3) | (ctx->total[0] >> 29)) );
|
||||||
|
|
||||||
/* Process last bytes. */
|
/* Process last bytes. */
|
||||||
md5_process_block(ctx->buffer, bytes + pad + 8, ctx);
|
md5_process_block(ctx->buffer, bytes + pad + 8, ctx);
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
// if fn is NULL then input is stdin and output is stdout
|
// if fn is NULL then input is stdin and output is stdout
|
||||||
static int convert(char *fn, int ConvType) {
|
static int convert(char *fn, int ConvType) {
|
||||||
char c;
|
int c;
|
||||||
char *tempFn = NULL;
|
char *tempFn = NULL;
|
||||||
FILE *in = stdin, *out = stdout;
|
FILE *in = stdin, *out = stdout;
|
||||||
|
|
||||||
|
2
dpkg.c
2
dpkg.c
@ -804,7 +804,7 @@ extern int dpkg_main(int argc, char **argv)
|
|||||||
|
|
||||||
package_t *p, *packages = NULL;
|
package_t *p, *packages = NULL;
|
||||||
void *status = NULL;
|
void *status = NULL;
|
||||||
char opt = 0;
|
int opt = 0;
|
||||||
int optflag = 0;
|
int optflag = 0;
|
||||||
|
|
||||||
while ((opt = getopt(argc, argv, "iruc")) != -1) {
|
while ((opt = getopt(argc, argv, "iruc")) != -1) {
|
||||||
|
6
insmod.c
6
insmod.c
@ -130,7 +130,7 @@
|
|||||||
#ifndef MODUTILS_MODULE_H
|
#ifndef MODUTILS_MODULE_H
|
||||||
static const int MODUTILS_MODULE_H = 1;
|
static const int MODUTILS_MODULE_H = 1;
|
||||||
|
|
||||||
#ident "$Id: insmod.c,v 1.64 2001/05/21 16:09:18 andersen Exp $"
|
#ident "$Id: insmod.c,v 1.65 2001/05/24 14:16:28 andersen Exp $"
|
||||||
|
|
||||||
/* This file contains the structures used by the 2.0 and 2.1 kernels.
|
/* This file contains the structures used by the 2.0 and 2.1 kernels.
|
||||||
We do not use the kernel headers directly because we do not wish
|
We do not use the kernel headers directly because we do not wish
|
||||||
@ -347,7 +347,7 @@ int delete_module(const char *);
|
|||||||
#ifndef MODUTILS_OBJ_H
|
#ifndef MODUTILS_OBJ_H
|
||||||
static const int MODUTILS_OBJ_H = 1;
|
static const int MODUTILS_OBJ_H = 1;
|
||||||
|
|
||||||
#ident "$Id: insmod.c,v 1.64 2001/05/21 16:09:18 andersen Exp $"
|
#ident "$Id: insmod.c,v 1.65 2001/05/24 14:16:28 andersen Exp $"
|
||||||
|
|
||||||
/* The relocatable object is manipulated using elfin types. */
|
/* The relocatable object is manipulated using elfin types. */
|
||||||
|
|
||||||
@ -374,8 +374,6 @@ static const int MODUTILS_OBJ_H = 1;
|
|||||||
|
|
||||||
#if (defined(__m68k__))
|
#if (defined(__m68k__))
|
||||||
#define ELFDATAM ELFDATA2MSB
|
#define ELFDATAM ELFDATA2MSB
|
||||||
#else
|
|
||||||
#define ELFDATAM ELFDATA2LSB
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
2
md5sum.c
2
md5sum.c
@ -244,7 +244,7 @@ void *md5_finish_ctx(struct md5_ctx *ctx, void *resbuf)
|
|||||||
/* Put the 64-bit file length in *bits* at the end of the buffer. */
|
/* Put the 64-bit file length in *bits* at the end of the buffer. */
|
||||||
*(md5_uint32 *) & ctx->buffer[bytes + pad] = SWAP(ctx->total[0] << 3);
|
*(md5_uint32 *) & ctx->buffer[bytes + pad] = SWAP(ctx->total[0] << 3);
|
||||||
*(md5_uint32 *) & ctx->buffer[bytes + pad + 4] =
|
*(md5_uint32 *) & ctx->buffer[bytes + pad + 4] =
|
||||||
SWAP((ctx->total[1] << 3) | (ctx->total[0] >> 29));
|
SWAP( ((ctx->total[1] << 3) | (ctx->total[0] >> 29)) );
|
||||||
|
|
||||||
/* Process last bytes. */
|
/* Process last bytes. */
|
||||||
md5_process_block(ctx->buffer, bytes + pad + 8, ctx);
|
md5_process_block(ctx->buffer, bytes + pad + 8, ctx);
|
||||||
|
@ -130,7 +130,7 @@
|
|||||||
#ifndef MODUTILS_MODULE_H
|
#ifndef MODUTILS_MODULE_H
|
||||||
static const int MODUTILS_MODULE_H = 1;
|
static const int MODUTILS_MODULE_H = 1;
|
||||||
|
|
||||||
#ident "$Id: insmod.c,v 1.64 2001/05/21 16:09:18 andersen Exp $"
|
#ident "$Id: insmod.c,v 1.65 2001/05/24 14:16:28 andersen Exp $"
|
||||||
|
|
||||||
/* This file contains the structures used by the 2.0 and 2.1 kernels.
|
/* This file contains the structures used by the 2.0 and 2.1 kernels.
|
||||||
We do not use the kernel headers directly because we do not wish
|
We do not use the kernel headers directly because we do not wish
|
||||||
@ -347,7 +347,7 @@ int delete_module(const char *);
|
|||||||
#ifndef MODUTILS_OBJ_H
|
#ifndef MODUTILS_OBJ_H
|
||||||
static const int MODUTILS_OBJ_H = 1;
|
static const int MODUTILS_OBJ_H = 1;
|
||||||
|
|
||||||
#ident "$Id: insmod.c,v 1.64 2001/05/21 16:09:18 andersen Exp $"
|
#ident "$Id: insmod.c,v 1.65 2001/05/24 14:16:28 andersen Exp $"
|
||||||
|
|
||||||
/* The relocatable object is manipulated using elfin types. */
|
/* The relocatable object is manipulated using elfin types. */
|
||||||
|
|
||||||
@ -374,8 +374,6 @@ static const int MODUTILS_OBJ_H = 1;
|
|||||||
|
|
||||||
#if (defined(__m68k__))
|
#if (defined(__m68k__))
|
||||||
#define ELFDATAM ELFDATA2MSB
|
#define ELFDATAM ELFDATA2MSB
|
||||||
#else
|
|
||||||
#define ELFDATAM ELFDATA2LSB
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user