Changeset 4405 for trunk/oscam-ac.c
- Timestamp:
- 01/11/11 12:13:32 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/oscam-ac.c
r4245 r4405 7 7 static uchar ac_ecmd5[CS_ECMSTORESIZE]; 8 8 9 LLIST _D_*ac_stat_list = NULL; //struct s_acasc10 LLIST _D_*acasc_list = NULL; //struct s_acasc_shm9 LLIST *ac_stat_list = NULL; //struct s_acasc 10 LLIST *acasc_list = NULL; //struct s_acasc_shm 11 11 12 12 int ac_init_log(void) … … 28 28 void ac_clear() 29 29 { 30 ll ist_clear(acasc_list);31 ll ist_clear(ac_stat_list);30 ll_clear_data(acasc_list); 31 ll_clear_data(ac_stat_list); 32 32 } 33 33 34 34 void ac_done_stat() 35 35 { 36 ac_clear(); 37 llist_destroy(acasc_list); 38 llist_destroy(ac_stat_list); 36 ll_destroy_data(acasc_list); 37 ll_destroy_data(ac_stat_list); 39 38 } 40 39 … … 44 43 ac_clear(); 45 44 else { 46 ac_stat_list = ll ist_create();47 acasc_list = ll ist_create();45 ac_stat_list = ll_create(); 46 acasc_list = ll_create(); 48 47 } 49 48 … … 69 68 struct s_client *cl_idx; 70 69 71 LLIST_D__ITR itr1, itr2; 70 LL_ITER *itr1 = ll_iter_create(ac_stat_list); 71 LL_ITER *itr2 = ll_iter_create(acasc_list); 72 72 i = 1; 73 struct s_acasc *ac_stat = ll ist_itr_init(ac_stat_list, &itr1);74 struct s_acasc_shm *acasc = llist_itr_init(acasc_list, &itr2);75 while ( acasc)73 struct s_acasc *ac_stat = ll_iter_next(itr1); 74 struct s_acasc_shm *acasc; 75 while ((acasc=ll_iter_next(itr2))) 76 76 { 77 77 int ac_stat_next = 1; … … 79 79 ac_stat = malloc(sizeof(struct s_acasc)); 80 80 memset(ac_stat, 0, sizeof(struct s_acasc)); 81 ll ist_append(ac_stat_list, ac_stat);81 ll_iter_insert(itr1, ac_stat); 82 82 ac_stat_next = 0; 83 83 } … … 138 138 139 139 if (ac_stat_next) 140 ac_stat = ll ist_itr_next(&itr1);140 ac_stat = ll_iter_next(itr1); 141 141 else 142 142 ac_stat = NULL; 143 acasc = llist_itr_next(&itr2);144 143 i++; 145 144 } 145 ll_iter_release(itr2); 146 ll_iter_release(itr1); 146 147 } 147 148 … … 187 188 struct s_acasc_shm *get_acasc(ushort ac_idx) { 188 189 int i=1; 189 LLIST_D__ITR itr; 190 191 struct s_acasc_shm *acasc = llist_itr_init(acasc_list, &itr); 192 while (acasc) { 193 if (i == ac_idx) 190 LL_ITER *itr = ll_iter_create(acasc_list); 191 192 struct s_acasc_shm *acasc; 193 while ((acasc=ll_iter_next(itr))) { 194 if (i == ac_idx) { 195 ll_iter_release(itr); 194 196 return acasc; 195 acasc = llist_itr_next(&itr); 197 } 196 198 i++; 197 199 } 198 200 acasc = malloc(sizeof(struct s_acasc_shm)); 199 201 memset(acasc, 0, sizeof(struct s_acasc_shm)); 200 llist_append(acasc_list, acasc); 202 ll_iter_insert(itr, acasc); 203 ll_iter_release(itr); 201 204 return acasc; 202 205 }
Note:
See TracChangeset
for help on using the changeset viewer.