[pisa-src] r2330 - in trunk: libpisa/hitlist.h pairing/accept.c pairing/management.c
- From: Mircea Gherzan <mircea.gherzan@xxxxxxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Mon, 17 May 2010 16:25:53 +0200
Author: gherzan
Date: Mon May 17 16:25:52 2010
New Revision: 2330
Log:
Convert some size-depicting variables to size_t type.
Modified:
trunk/libpisa/hitlist.h
trunk/pairing/accept.c
trunk/pairing/management.c
Modified: trunk/libpisa/hitlist.h
==============================================================================
--- trunk/libpisa/hitlist.h Thu May 13 14:02:00 2010 (r2329)
+++ trunk/libpisa/hitlist.h Mon May 17 16:25:52 2010 (r2330)
@@ -22,8 +22,8 @@
*/
struct pisa_hitlist {
struct pisa_hitlist_entry *entries;
- int max_slots;
- int cur_slots;
+ size_t max_slots;
+ size_t cur_slots;
};
/**
Modified: trunk/pairing/accept.c
==============================================================================
--- trunk/pairing/accept.c Thu May 13 14:02:00 2010 (r2329)
+++ trunk/pairing/accept.c Mon May 17 16:25:52 2010 (r2330)
@@ -74,7 +74,7 @@
{
struct pisa_hitlist *hitlist_allowed_hosts;
struct pisa_hitlist_entry *entry;
- int i, changes;
+ unsigned int i, changes;
time_t now;
struct tm *ts;
char buffer[80];
Modified: trunk/pairing/management.c
==============================================================================
--- trunk/pairing/management.c Thu May 13 14:02:00 2010 (r2329)
+++ trunk/pairing/management.c Mon May 17 16:25:52 2010 (r2330)
@@ -75,14 +75,14 @@
struct pisa_userhitlist {
struct pisa_userhitlist_entry *entries;
- int max_slots;
- int cur_slots;
+ size_t max_slots;
+ size_t cur_slots;
};
struct pisa_userlist {
struct pisa_userlist_entry *entries;
- int max_slots;
- int cur_slots;
+ size_t max_slots;
+ size_t cur_slots;
};
struct options {
@@ -233,7 +233,8 @@
return NULL;
}
- int i, j;
+ unsigned int i = 0;
+ unsigned int j = 0;
char hit_tmp[INET6_ADDRSTRLEN];
char buf_expiration[LENGTH_TIMEOUT];
struct pisa_hitlist_entry *entry;
@@ -246,9 +247,6 @@
merged_list->entries = calloc(sizeof(struct pisa_userhitlist_entry),
merged_list->max_slots);
- i = 0;
- j = 0;
-
// Mergesort
while (i < ul->max_slots && j < hl->max_slots) {
ulentry = &ul->entries[i];
@@ -369,7 +367,7 @@
memcpy(&s.user_name, name, sizeof(s.user_name));
// lfind because userlist is sorted by HIT
- ret = lfind(&s, ul->entries, (size_t *) &ul->cur_slots,
+ ret = lfind(&s, ul->entries, &ul->cur_slots,
sizeof(struct pisa_userlist_entry),
pisa_userlist_entry_compare_name);
@@ -1010,7 +1008,7 @@
userlist = pisa_userlist_build(USERS_SECTION);
hitlist_allowed_hosts = pisa_hitlist_build("allowed_hosts");
merged_list = pisa_merge_lists(userlist,
hitlist_allowed_hosts);
- int i;
+ unsigned int i;
for (i = 0; i < merged_list->cur_slots; i++) {
uhlentry = &merged_list->entries[i];
Other related posts:
- » [pisa-src] r2330 - in trunk: libpisa/hitlist.h pairing/accept.c pairing/management.c - Mircea Gherzan
