/[ipchat]/ipchat/src/demux.c
ViewVC logotype

Diff of /ipchat/src/demux.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.12 by beatk, Sun Mar 20 22:50:01 2005 UTC revision 1.13 by matiasaguirre, Mon Mar 21 01:47:53 2005 UTC
# Line 485  timer_pq_add (time_t next_alarm, unsigne Line 485  timer_pq_add (time_t next_alarm, unsigne
485                long int time_shift, void (*callback) (void *),                long int time_shift, void (*callback) (void *),
486                void *data)                void *data)
487  {  {
         static timer_id timer_id_cnt = 0;  /* for timer identifiers */  
488          struct timer_pq_node *new_node;          struct timer_pq_node *new_node;
489    
490          if (timer_q.size == 0) {          if (timer_q.size == 0) {
# Line 495  timer_pq_add (time_t next_alarm, unsigne Line 494  timer_pq_add (time_t next_alarm, unsigne
494          }          }
495    
496          new_node = (struct timer_pq_node*)malloc (sizeof(struct timer_pq_node));          new_node = (struct timer_pq_node*)malloc (sizeof(struct timer_pq_node));
497          new_node->id = timer_id_cnt++; /* TODO may overflow! */          new_node->id = (int)new_node;
498          new_node->next_alarm = next_alarm;          new_node->next_alarm = next_alarm;
499          new_node->time_incr = time_incr;          new_node->time_incr = time_incr;
500          new_node->time_shift = time_shift;          new_node->time_shift = time_shift;
# Line 576  proc_timer (struct timer_pq_node *timer) Line 575  proc_timer (struct timer_pq_node *timer)
575                                  timer->next_alarm = now + timer->time_incr;                                  timer->next_alarm = now + timer->time_incr;
576                          }                          }
577                  }                  }
578                  tmp_node.id = timer->id;                  pq_chpri (timer, timer->next_alarm, &timer_q);
                 pq_chpri (&tmp_node, timer->next_alarm, &timer_q);  
579          }          }
580          else {          else {
581                  dmx_remove_timer (timer->id);                  dmx_remove_timer (timer->id);

Legend:
Removed from v.1.12  
changed lines
  Added in v.1.13

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26