[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[dotgnu-pnet-commits] [SCM] DotGNU Portable.NET engine, compilers and to
|
From: |
Klaus Treichel |
|
Subject: |
[dotgnu-pnet-commits] [SCM] DotGNU Portable.NET engine, compilers and tools (pnet) branch, master, updated. 9d1be11f641d84e58453e33e5fbf1d85518ad24a |
|
Date: |
Thu, 14 Apr 2011 19:31:35 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "DotGNU Portable.NET engine, compilers and tools (pnet)".
The branch, master has been updated
via 9d1be11f641d84e58453e33e5fbf1d85518ad24a (commit)
from c26def30379fb5ff6d188954d30d7e722c9f09e7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/pnet.git/commit/?id=9d1be11f641d84e58453e33e5fbf1d85518ad24a
commit 9d1be11f641d84e58453e33e5fbf1d85518ad24a
Author: Klaus Treichel <address@hidden>
Date: Thu Apr 14 21:31:21 2011 +0200
Fix more gcc 4.6 warnings
diff --git a/ChangeLog b/ChangeLog
index 14c1d18..1c5adb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
(GenDelegateInvoke): Remove unused variable thisType.
(_ILCoderGenDelegateBeginInvoke): Remove unused variable delegateClass.
+ * support/list.c (ILSinglelyLinkedListFind): Remove unused variable
prev.
+ (ILSinglelyLinkedListReverseFind): likewise
+
2011-04-10 Klaus Treichel <address@hidden>
* engine/lib_delegate.c (CreateDelegateSignature): Remove the unused
diff --git a/support/list.c b/support/list.c
index e4bcd05..fdc667d 100644
--- a/support/list.c
+++ b/support/list.c
@@ -33,324 +33,320 @@ extern "C" {
typedef struct _tagILSinglelyLinkedListEntry ILSinglelyLinkedListEntry;
struct _tagILSinglelyLinkedListEntry
-{
- ILSinglelyLinkedListEntry *next;
- void *data;
+{
+ ILSinglelyLinkedListEntry *next;
+ void *data;
};
typedef struct _tagILSinglelyLinkedList
-{
- ILList list;
- ILSinglelyLinkedListEntry *first;
- ILSinglelyLinkedListEntry *last;
+{
+ ILList list;
+ ILSinglelyLinkedListEntry *first;
+ ILSinglelyLinkedListEntry *last;
}
ILSinglelyLinkedList;
static void ILSinglelyLinkedListDestroy(ILList *_list)
-{
- ILSinglelyLinkedList *list;
- ILSinglelyLinkedListEntry *entry, *next;
-
- list = (ILSinglelyLinkedList *)_list;
-
- entry = list->first;
-
- while (entry)
- {
- next = entry->next;
-
- ILFree(entry);
-
- entry = next;
- }
-
- ILFree(list);
+{
+ ILSinglelyLinkedList *list;
+ ILSinglelyLinkedListEntry *entry, *next;
+
+ list = (ILSinglelyLinkedList *)_list;
+
+ entry = list->first;
+
+ while (entry)
+ {
+ next = entry->next;
+
+ ILFree(entry);
+
+ entry = next;
+ }
+
+ ILFree(list);
}
static int ILSinglelyLinkedListAppend(ILList *_list, void *data)
-{
- ILSinglelyLinkedList *list;
- ILSinglelyLinkedListEntry *entry;
-
- entry = (ILSinglelyLinkedListEntry *)ILMalloc(sizeof(*entry));
-
- if (entry == 0)
- {
- return -1;
- }
-
- entry->data = data;
- entry->next = 0;
-
- list = (ILSinglelyLinkedList *)_list;
-
- if (list->last)
- {
- list->last->next = entry;
- list->last = entry;
- }
- else
- {
- list->first = list->last = entry;
- }
-
- list->list.count++;
-
- return list->list.count - 1;
+{
+ ILSinglelyLinkedList *list;
+ ILSinglelyLinkedListEntry *entry;
+
+ entry = (ILSinglelyLinkedListEntry *)ILMalloc(sizeof(*entry));
+
+ if (entry == 0)
+ {
+ return -1;
+ }
+
+ entry->data = data;
+ entry->next = 0;
+
+ list = (ILSinglelyLinkedList *)_list;
+
+ if (list->last)
+ {
+ list->last->next = entry;
+ list->last = entry;
+ }
+ else
+ {
+ list->first = list->last = entry;
+ }
+
+ list->list.count++;
+
+ return list->list.count - 1;
}
static void *ILSinglelyLinkedListGetAt(ILList *_list, int index)
-{
- ILSinglelyLinkedList *list;
- ILSinglelyLinkedListEntry *entry;
-
- list = (ILSinglelyLinkedList *)_list;
-
- entry = list->first;
-
- if (index < 0)
- {
- return 0;
- }
-
- if (index >= list->list.count)
- {
- return 0;
- }
-
- while (entry)
- {
- if (index == 0)
- {
- return entry->data;
- }
-
- index--;
- }
-
- return 0;
+{
+ ILSinglelyLinkedList *list;
+ ILSinglelyLinkedListEntry *entry;
+
+ list = (ILSinglelyLinkedList *)_list;
+
+ entry = list->first;
+
+ if (index < 0)
+ {
+ return 0;
+ }
+
+ if (index >= list->list.count)
+ {
+ return 0;
+ }
+
+ while (entry)
+ {
+ if (index == 0)
+ {
+ return entry->data;
+ }
+
+ index--;
+ }
+
+ return 0;
}
static void **ILSinglelyLinkedListFind(ILList *_list, void *data)
-{
- int index;
- ILSinglelyLinkedList *list;
- ILSinglelyLinkedListEntry *entry, *prev;
-
- list = (ILSinglelyLinkedList *)_list;
-
- prev = 0;
- entry = list->first;
-
- index = 0;
-
- while (entry)
- {
- if (entry->data == data)
- {
- return &entry->data;
- }
-
- index++;
- prev = entry;
- entry = entry->next;
- }
-
- return 0;
+{
+ int index;
+ ILSinglelyLinkedList *list;
+ ILSinglelyLinkedListEntry *entry;
+
+ list = (ILSinglelyLinkedList *)_list;
+
+ entry = list->first;
+
+ index = 0;
+
+ while (entry)
+ {
+ if (entry->data == data)
+ {
+ return &entry->data;
+ }
+
+ index++;
+ entry = entry->next;
+ }
+
+ return 0;
}
static void **ILSinglelyLinkedListReverseFind(ILList *_list, void *data)
-{
- int index;
- void **found;
- ILSinglelyLinkedList *list;
- ILSinglelyLinkedListEntry *entry, *prev;
-
- list = (ILSinglelyLinkedList *)_list;
-
- prev = 0;
- entry = list->first;
-
- index = 0;
- found = 0;
-
- while (entry)
- {
- if (entry->data == data)
- {
- found = &entry->data;
- }
-
- index++;
- prev = entry;
- entry = entry->next;
- }
-
- return found;
+{
+ int index;
+ void **found;
+ ILSinglelyLinkedList *list;
+ ILSinglelyLinkedListEntry *entry;
+
+ list = (ILSinglelyLinkedList *)_list;
+
+ entry = list->first;
+
+ index = 0;
+ found = 0;
+
+ while (entry)
+ {
+ if (entry->data == data)
+ {
+ found = &entry->data;
+ }
+
+ index++;
+ entry = entry->next;
+ }
+
+ return found;
}
static int ILSinglelyLinkedListRemove(ILList *_list, void *data)
-{
- int index;
- ILSinglelyLinkedList *list;
- ILSinglelyLinkedListEntry *entry, *prev;
-
- list = (ILSinglelyLinkedList *)_list;
-
- prev = 0;
- entry = list->first;
-
- index = 0;
-
- while (entry)
- {
- if (entry->data == data)
- {
- if (prev == 0)
- {
- list->first = entry->next;
-
- if (entry->next == 0)
- {
- list->last = 0;
- }
- }
- else
- {
- prev->next = entry->next;
-
- if (entry->next == 0)
- {
- list->last = prev;
- }
- }
-
- ILFree(entry);
-
- list->list.count--;
-
- return index;
- }
-
- index++;
- prev = entry;
- entry = entry->next;
- }
-
- return -1;
+{
+ int index;
+ ILSinglelyLinkedList *list;
+ ILSinglelyLinkedListEntry *entry, *prev;
+
+ list = (ILSinglelyLinkedList *)_list;
+
+ prev = 0;
+ entry = list->first;
+
+ index = 0;
+
+ while (entry)
+ {
+ if (entry->data == data)
+ {
+ if (prev == 0)
+ {
+ list->first = entry->next;
+
+ if (entry->next == 0)
+ {
+ list->last = 0;
+ }
+ }
+ else
+ {
+ prev->next = entry->next;
+
+ if (entry->next == 0)
+ {
+ list->last = prev;
+ }
+ }
+
+ ILFree(entry);
+
+ list->list.count--;
+
+ return index;
+ }
+
+ index++;
+ prev = entry;
+ entry = entry->next;
+ }
+
+ return -1;
}
static int ILSinglelyLinkedListRemoveAt(ILList *_list, int index)
-{
- int count;
- ILSinglelyLinkedList *list;
- ILSinglelyLinkedListEntry *entry, *prev;
-
- list = (ILSinglelyLinkedList *)_list;
-
- prev = 0;
- entry = list->first;
-
- if (index < 0)
- {
- return -1;
- }
-
- if (index >= list->list.count)
- {
- return -1;
- }
-
- count = 0;
-
- while (entry)
- {
- if (count == index)
- {
- if (prev == 0)
- {
- list->first = entry->next;
-
- if (entry->next == 0)
- {
- list->last = 0;
- }
- }
- else
- {
- prev->next = entry->next;
-
- if (entry->next == 0)
- {
- list->last = prev;
- }
- }
-
- ILFree(entry);
-
- list->list.count--;
-
- return index;
- }
-
- count++;
- prev = entry;
- entry = entry->next;
- }
-
- return -1;
+{
+ int count;
+ ILSinglelyLinkedList *list;
+ ILSinglelyLinkedListEntry *entry, *prev;
+
+ list = (ILSinglelyLinkedList *)_list;
+
+ prev = 0;
+ entry = list->first;
+
+ if (index < 0)
+ {
+ return -1;
+ }
+
+ if (index >= list->list.count)
+ {
+ return -1;
+ }
+
+ count = 0;
+
+ while (entry)
+ {
+ if (count == index)
+ {
+ if (prev == 0)
+ {
+ list->first = entry->next;
+
+ if (entry->next == 0)
+ {
+ list->last = 0;
+ }
+ }
+ else
+ {
+ prev->next = entry->next;
+
+ if (entry->next == 0)
+ {
+ list->last = prev;
+ }
+ }
+
+ ILFree(entry);
+
+ list->list.count--;
+
+ return index;
+ }
+
+ count++;
+ prev = entry;
+ entry = entry->next;
+ }
+
+ return -1;
}
static int ILSinglelyLinkedListWalk(ILList *_list, ILListWalkCallback
WalkCallbackFunc, void *state)
-{
- int count;
- ILSinglelyLinkedList *list;
- ILSinglelyLinkedListEntry *entry, *next;
-
- list = (ILSinglelyLinkedList *)_list;
-
- entry = list->first;
-
- count = 0;
-
- while (entry)
- {
- count++;
-
- next = entry->next;
-
- if (!WalkCallbackFunc(_list, &entry->data, state))
- {
- return count;
- }
-
- entry = next;
- }
-
- return count;
+{
+ int count;
+ ILSinglelyLinkedList *list;
+ ILSinglelyLinkedListEntry *entry, *next;
+
+ list = (ILSinglelyLinkedList *)_list;
+
+ entry = list->first;
+
+ count = 0;
+
+ while (entry)
+ {
+ count++;
+
+ next = entry->next;
+
+ if (!WalkCallbackFunc(_list, &entry->data, state))
+ {
+ return count;
+ }
+
+ entry = next;
+ }
+
+ return count;
}
ILList *ILSinglelyLinkedListCreate()
-{
- ILSinglelyLinkedList *list;
-
- list = (ILSinglelyLinkedList *)ILMalloc(sizeof(ILSinglelyLinkedList));
-
- list->list.count = 0;
-
- list->list.appendFunc = ILSinglelyLinkedListAppend;
- list->list.findFunc = ILSinglelyLinkedListFind;
- list->list.reverseFindFunc = ILSinglelyLinkedListReverseFind;
- list->list.destroyFunc = ILSinglelyLinkedListDestroy;
- list->list.getAtFunc = ILSinglelyLinkedListGetAt;
- list->list.walkFunc = ILSinglelyLinkedListWalk;
- list->list.removeAtFunc = ILSinglelyLinkedListRemoveAt;
- list->list.removeFunc = ILSinglelyLinkedListRemove;
-
- list->first = 0;
- list->last = 0;
-
- return (ILList *)list;
+{
+ ILSinglelyLinkedList *list;
+
+ list = (ILSinglelyLinkedList *)ILMalloc(sizeof(ILSinglelyLinkedList));
+
+ list->list.count = 0;
+
+ list->list.appendFunc = ILSinglelyLinkedListAppend;
+ list->list.findFunc = ILSinglelyLinkedListFind;
+ list->list.reverseFindFunc = ILSinglelyLinkedListReverseFind;
+ list->list.destroyFunc = ILSinglelyLinkedListDestroy;
+ list->list.getAtFunc = ILSinglelyLinkedListGetAt;
+ list->list.walkFunc = ILSinglelyLinkedListWalk;
+ list->list.removeAtFunc = ILSinglelyLinkedListRemoveAt;
+ list->list.removeFunc = ILSinglelyLinkedListRemove;
+
+ list->first = 0;
+ list->last = 0;
+
+ return (ILList *)list;
}
/*
@@ -358,188 +354,188 @@ ILList *ILSinglelyLinkedListCreate()
*/
typedef struct _tagILArraylist
-{
- ILList list;
- int capacity;
- void **array;
+{
+ ILList list;
+ int capacity;
+ void **array;
}
ILArrayList;
static void ILArrayListDestroy(ILList *_list)
-{
- ILArrayList *list = (ILArrayList *)_list;
-
- ILFree(list->array);
- ILFree(list);
+{
+ ILArrayList *list = (ILArrayList *)_list;
+
+ ILFree(list->array);
+ ILFree(list);
}
static int ILArrayListAppend(ILList *_list, void *data)
-{
- void **newArray;
- ILArrayList *list = (ILArrayList *)_list;
-
- if (list->list.count == list->capacity)
- {
- newArray = (void **)ILMalloc(list->capacity * 2);
-
- if (newArray == 0)
- {
- return -1;
- }
-
- ILMemCpy(newArray, list->array, list->capacity * sizeof(void
*));
-
- ILFree(list->array);
- list->array = newArray;
- list->capacity = list->capacity * 2;
- }
-
- list->array[list->list.count++] = data;
-
- return list->list.count - 1;
+{
+ void **newArray;
+ ILArrayList *list = (ILArrayList *)_list;
+
+ if (list->list.count == list->capacity)
+ {
+ newArray = (void **)ILMalloc(list->capacity * 2);
+
+ if (newArray == 0)
+ {
+ return -1;
+ }
+
+ ILMemCpy(newArray, list->array, list->capacity * sizeof(void
*));
+
+ ILFree(list->array);
+ list->array = newArray;
+ list->capacity = list->capacity * 2;
+ }
+
+ list->array[list->list.count++] = data;
+
+ return list->list.count - 1;
}
static void *ILArrayListGetAt(ILList *_list, int index)
-{
- ILArrayList *list = (ILArrayList *)_list;
-
- if (index < 0)
- {
- return 0;
- }
-
- if (index >= list->list.count)
- {
- return 0;
- }
-
- return list->array[index];
+{
+ ILArrayList *list = (ILArrayList *)_list;
+
+ if (index < 0)
+ {
+ return 0;
+ }
+
+ if (index >= list->list.count)
+ {
+ return 0;
+ }
+
+ return list->array[index];
}
static void **ILArrayListFind(ILList *_list, void *data)
-{
- int i;
- ILArrayList *list = (ILArrayList *)_list;
-
- for (i = 0; i < list->list.count; i++)
- {
- if (list->array[i] == data)
- {
- return &list->array[i];
- }
- }
-
- return 0;
+{
+ int i;
+ ILArrayList *list = (ILArrayList *)_list;
+
+ for (i = 0; i < list->list.count; i++)
+ {
+ if (list->array[i] == data)
+ {
+ return &list->array[i];
+ }
+ }
+
+ return 0;
}
static void **ILArrayListReverseFind(ILList *_list, void *data)
-{
- int i;
- ILArrayList *list = (ILArrayList *)_list;
-
- for (i = list->list.count - 1; i >= 0; i--)
- {
- if (list->array[i] == data)
- {
- return &list->array[i];
- }
- }
-
- return 0;
+{
+ int i;
+ ILArrayList *list = (ILArrayList *)_list;
+
+ for (i = list->list.count - 1; i >= 0; i--)
+ {
+ if (list->array[i] == data)
+ {
+ return &list->array[i];
+ }
+ }
+
+ return 0;
}
static int ILArrayListRemove(ILList *_list, void *data)
-{
- int i;
- ILArrayList *list = (ILArrayList *)_list;
-
- for (i = 0; i < list->list.count; i++)
- {
- if (list->array[i] == data)
- {
- return i;
- }
- }
-
- list->list.count--;
-
- return -1;
+{
+ int i;
+ ILArrayList *list = (ILArrayList *)_list;
+
+ for (i = 0; i < list->list.count; i++)
+ {
+ if (list->array[i] == data)
+ {
+ return i;
+ }
+ }
+
+ list->list.count--;
+
+ return -1;
}
static int ILArrayListRemoveAt(ILList *_list, int index)
-{
- ILArrayList *list = (ILArrayList *)_list;
-
- if (index < 0)
- {
- return -1;
- }
-
- if (index >= list->list.count)
- {
- return -1;
- }
-
- ILMemCpy(list->array + index, list->array + index + 1, list->list.count
- index - 1);
-
- list->list.count--;
- list->array[list->list.count] = 0;
-
- return index;
+{
+ ILArrayList *list = (ILArrayList *)_list;
+
+ if (index < 0)
+ {
+ return -1;
+ }
+
+ if (index >= list->list.count)
+ {
+ return -1;
+ }
+
+ ILMemCpy(list->array + index, list->array + index + 1, list->list.count
- index - 1);
+
+ list->list.count--;
+ list->array[list->list.count] = 0;
+
+ return index;
}
static int ILArrayListWalk(ILList *_list, ILListWalkCallback WalkCallbackFunc,
void *state)
-{
- int i;
- ILArrayList *list = (ILArrayList *)_list;
-
- for (i = 0; i < list->list.count; i++)
- {
- if (!WalkCallbackFunc(_list, &list->array[i], state))
- {
- return i + 1;
- }
- }
-
- return i;
+{
+ int i;
+ ILArrayList *list = (ILArrayList *)_list;
+
+ for (i = 0; i < list->list.count; i++)
+ {
+ if (!WalkCallbackFunc(_list, &list->array[i], state))
+ {
+ return i + 1;
+ }
+ }
+
+ return i;
}
ILList *ILArrayListCreate(int capacity)
-{
- ILArrayList *list;
-
- if ((list = (ILArrayList *)ILMalloc(sizeof(*list))) == 0)
- {
- return 0;
- }
-
- if (capacity < 16)
- {
- capacity = 16;
- }
-
- list->array = (void **)ILMalloc(capacity * sizeof(void *));
-
- if (list->array == 0)
- {
- ILFree(list);
-
- return 0;
- }
-
- list->list.count = 0;
- list->capacity = capacity;
-
- list->list.appendFunc = ILArrayListAppend;
- list->list.findFunc = ILArrayListFind;
- list->list.reverseFindFunc = ILArrayListReverseFind;
- list->list.destroyFunc = ILArrayListDestroy;
- list->list.getAtFunc = ILArrayListGetAt;
- list->list.walkFunc = ILArrayListWalk;
- list->list.removeAtFunc = ILArrayListRemoveAt;
- list->list.removeFunc = ILArrayListRemove;
-
- return (ILList *)list;
+{
+ ILArrayList *list;
+
+ if ((list = (ILArrayList *)ILMalloc(sizeof(*list))) == 0)
+ {
+ return 0;
+ }
+
+ if (capacity < 16)
+ {
+ capacity = 16;
+ }
+
+ list->array = (void **)ILMalloc(capacity * sizeof(void *));
+
+ if (list->array == 0)
+ {
+ ILFree(list);
+
+ return 0;
+ }
+
+ list->list.count = 0;
+ list->capacity = capacity;
+
+ list->list.appendFunc = ILArrayListAppend;
+ list->list.findFunc = ILArrayListFind;
+ list->list.reverseFindFunc = ILArrayListReverseFind;
+ list->list.destroyFunc = ILArrayListDestroy;
+ list->list.getAtFunc = ILArrayListGetAt;
+ list->list.walkFunc = ILArrayListWalk;
+ list->list.removeAtFunc = ILArrayListRemoveAt;
+ list->list.removeFunc = ILArrayListRemove;
+
+ return (ILList *)list;
}
#ifdef __cplusplus
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 3 +
support/list.c | 878 ++++++++++++++++++++++++++++----------------------------
2 files changed, 440 insertions(+), 441 deletions(-)
hooks/post-receive
--
DotGNU Portable.NET engine, compilers and tools (pnet)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [dotgnu-pnet-commits] [SCM] DotGNU Portable.NET engine, compilers and tools (pnet) branch, master, updated. 9d1be11f641d84e58453e33e5fbf1d85518ad24a,
Klaus Treichel <=
- Prev by Date:
[dotgnu-pnet-commits] [SCM] DotGNU Portable.NET engine, compilers and tools (pnet) branch, master, updated. c26def30379fb5ff6d188954d30d7e722c9f09e7
- Next by Date:
[dotgnu-pnet-commits] [SCM] DotGNU Portable.NET engine, compilers and tools (pnet) branch, master, updated. 05fc39b5cc7d675a627efbcce21f04b73d781a58
- Previous by thread:
[dotgnu-pnet-commits] [SCM] DotGNU Portable.NET engine, compilers and tools (pnet) branch, master, updated. c26def30379fb5ff6d188954d30d7e722c9f09e7
- Next by thread:
[dotgnu-pnet-commits] [SCM] DotGNU Portable.NET engine, compilers and tools (pnet) branch, master, updated. 05fc39b5cc7d675a627efbcce21f04b73d781a58
- Index(es):