Changeset 5067 for trunk/oscam.c
- Timestamp:
- 04/21/11 09:08:45 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/oscam.c
r5065 r5067 534 534 if(cl && !cl->cleaned){ //cleaned=0 535 535 cl->cleaned++; //cleaned=1 536 537 //kill_thread also removes this client, so here just to get sure client is removed: 536 538 struct s_client *prev, *cl2; 537 539 for (prev=first_client, cl2=first_client->next; prev->next != NULL; prev=prev->next, cl2=cl2->next) 538 540 if (cl == cl2) 539 541 break; 540 if (cl != cl2) 541 cs_log("FATAL ERROR: could not find client to remove from list."); 542 else 542 if (cl == cl2) 543 543 prev->next = cl2->next; //remove client from list 544 544 … … 1143 1143 pthread_t thread = cl->thread; 1144 1144 if (pthread_equal(thread, pthread_self())) return; //cant kill yourself 1145 1146 struct s_client *prev, *cl2; 1147 for (prev=first_client, cl2=first_client->next; prev->next != NULL; prev=prev->next, cl2=cl2->next) 1148 if (cl == cl2) 1149 break; 1150 if (cl != cl2) 1151 cs_log("FATAL ERROR: could not find client to remove from list."); 1152 else 1153 prev->next = cl2->next; //remove client from list 1145 1154 1146 1155 pthread_cancel(thread); … … 2134 2143 if (ert->rc<E_99) { 2135 2144 //cs_debug_mask(D_TRACE, "chk_dcw: already done rc=%d %s", er->rc, er->selected_reader->label); 2136 send_reader_stat(er->selected_reader, er , (er->rc <= E_RDR_NOTFOUND)?E_NOTFOUND:E_FOUND);2145 send_reader_stat(er->selected_reader, ert, (er->rc <= E_RDR_NOTFOUND)?E_NOTFOUND:E_FOUND); 2137 2146 return; // already done 2138 2147 }
Note:
See TracChangeset
for help on using the changeset viewer.