ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winegcc: Sign-compare fixes.

This commit is contained in:
Joris Huizer 2007-02-10 03:57:25 -08:00 committed by Alexandre Julliard
parent d0e12bdef7
commit 909425d99d
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/winegcc/utils.c
View File

@ -118,16 +118,16 @@ void strarray_add(strarray* arr, const char* str)
arr->base[arr->size++] = str; arr->base[arr->size++] = str;
} }
void strarray_del(strarray* arr, int i) void strarray_del(strarray* arr, unsigned int i)
{ {
if (i < 0 || i >= arr->size) error("Invalid index i=%d", i); if (i >= arr->size) error("Invalid index i=%d", i);
memmove(&arr->base[i], &arr->base[i + 1], (arr->size - i - 1) * sizeof(arr->base[0])); memmove(&arr->base[i], &arr->base[i + 1], (arr->size - i - 1) * sizeof(arr->base[0]));
arr->size--; arr->size--;
} }
void strarray_addall(strarray* arr, const strarray* from) void strarray_addall(strarray* arr, const strarray* from)
{ {
int i; unsigned int i;
for (i = 0; i < from->size; i++) for (i = 0; i < from->size; i++)
strarray_add(arr, from->base[i]); strarray_add(arr, from->base[i]);
@ -136,7 +136,7 @@ void strarray_addall(strarray* arr, const strarray* from)
strarray* strarray_dup(const strarray* arr) strarray* strarray_dup(const strarray* arr)
{ {
strarray* dup = strarray_alloc(); strarray* dup = strarray_alloc();
int i; unsigned int i;
for (i = 0; i < arr->size; i++) for (i = 0; i < arr->size; i++)
strarray_add(dup, arr->base[i]); strarray_add(dup, arr->base[i]);
@ -160,7 +160,7 @@ strarray* strarray_fromstring(const char* str, const char* delim)
char* strarray_tostring(const strarray* arr, const char* sep) char* strarray_tostring(const strarray* arr, const char* sep)
{ {
char *str, *newstr; char *str, *newstr;
int i; unsigned int i;
str = strmake("%s", arr->base[0]); str = strmake("%s", arr->base[0]);
for (i = 1; i < arr->size; i++) for (i = 1; i < arr->size; i++)
@ -277,7 +277,7 @@ static file_type guess_lib_type(const char* dir, const char* library, char** fil
file_type get_lib_type(strarray* path, const char* library, char** file) file_type get_lib_type(strarray* path, const char* library, char** file)
{ {
int i; unsigned int i;
for (i = 0; i < path->size; i++) for (i = 0; i < path->size; i++)
{ {
@ -289,7 +289,8 @@ file_type get_lib_type(strarray* path, const char* library, char** file)
void spawn(const strarray* prefix, const strarray* args, int ignore_errors) void spawn(const strarray* prefix, const strarray* args, int ignore_errors)
{ {
int i, status; unsigned int i;
int status;
strarray* arr = strarray_dup(args); strarray* arr = strarray_dup(args);
const char** argv; const char** argv;
char* prog = 0; char* prog = 0;

2
tools/winegcc/utils.h
View File

@ -48,7 +48,7 @@ strarray* strarray_alloc(void);
strarray* strarray_dup(const strarray* arr); strarray* strarray_dup(const strarray* arr);
void strarray_free(strarray* arr); void strarray_free(strarray* arr);
void strarray_add(strarray* arr, const char* str); void strarray_add(strarray* arr, const char* str);
void strarray_del(strarray* arr, int i); void strarray_del(strarray* arr, unsigned int i);
void strarray_addall(strarray* arr, const strarray* from); void strarray_addall(strarray* arr, const strarray* from);
strarray* strarray_fromstring(const char* str, const char* delim); strarray* strarray_fromstring(const char* str, const char* delim);
char* strarray_tostring(const strarray* arr, const char* sep); char* strarray_tostring(const strarray* arr, const char* sep);

11
tools/winegcc/winegcc.c
View File

@ -170,7 +170,7 @@ struct options
static void clean_temp_files(void) static void clean_temp_files(void)
{ {
int i; unsigned int i;
if (keep_generated) return; if (keep_generated) return;
@ -239,7 +239,8 @@ static const strarray* get_translator(enum processor processor)
static void compile(struct options* opts, const char* lang) static void compile(struct options* opts, const char* lang)
{ {
strarray* comp_args = strarray_alloc(); strarray* comp_args = strarray_alloc();
int j, gcc_defs = 0; unsigned int j;
int gcc_defs = 0;
switch(opts->processor) switch(opts->processor)
{ {
@ -434,7 +435,7 @@ static void build(struct options* opts)
const char *output_name, *spec_file, *lang; const char *output_name, *spec_file, *lang;
const char* winebuild = getenv("WINEBUILD"); const char* winebuild = getenv("WINEBUILD");
int generate_app_loader = 1; int generate_app_loader = 1;
int j; unsigned int j;
/* NOTE: for the files array we'll use the following convention: /* NOTE: for the files array we'll use the following convention:
* -axxx: xxx is an archive (.a) * -axxx: xxx is an archive (.a)
@ -719,7 +720,7 @@ static int is_linker_arg(const char* arg)
"-static", "-static-libgcc", "-shared", "-shared-libgcc", "-symbolic", "-static", "-static-libgcc", "-shared", "-shared-libgcc", "-symbolic",
"-framework" "-framework"
}; };
int j; unsigned int j;
switch (arg[1]) switch (arg[1])
{ {
@ -769,7 +770,7 @@ static int is_mingw_arg(const char* arg)
{ {
"-mno-cygwin", "-mwindows", "-mconsole", "-mthreads", "-municode" "-mno-cygwin", "-mwindows", "-mconsole", "-mthreads", "-municode"
}; };
int j; unsigned int j;
for (j = 0; j < sizeof(mingw_switches)/sizeof(mingw_switches[0]); j++) for (j = 0; j < sizeof(mingw_switches)/sizeof(mingw_switches[0]); j++)
if (strcmp(mingw_switches[j], arg) == 0) return 1; if (strcmp(mingw_switches[j], arg) == 0) return 1;