]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
revert
authorAnthony Minessale <anthm@freeswitch.org>
Fri, 16 Sep 2011 16:46:40 +0000 (11:46 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Fri, 16 Sep 2011 16:46:40 +0000 (11:46 -0500)
src/mod/applications/mod_valet_parking/mod_valet_parking.c

index 3ac27b15338d8cb8ba4ddf97ceff83ddc274eda9..0b25a47e94f83c73076b19c3bf352e701e4b4bd6 100644 (file)
@@ -92,49 +92,40 @@ static void check_timeouts(void)
        void *val;
        time_t now;
        valet_lot_t *lot;
-       switch_console_callback_match_t *matches = NULL;
-       switch_console_callback_match_node_t *m;
-       switch_hash_index_t *i_hi;
-       const void *i_var;
-       void *i_val;
-       char *i_ext;
-       valet_token_t *token;
 
        now = switch_epoch_time_now(NULL);
 
        switch_mutex_lock(globals.mutex);
-       for (hi = switch_hash_first(NULL, globals.hash); hi; hi = switch_hash_next(hi)) {
-               switch_hash_this(hi, &var, NULL, &val);
-               switch_console_push_match(&matches, (const char *) var);
-       }
-       switch_mutex_unlock(globals.mutex);
 
 
-       if (matches) {
-               for (m = matches->head; m; m = m->next) {
+       for (hi = switch_hash_first(NULL, globals.hash); hi; hi = switch_hash_next(hi)) {
+               switch_hash_index_t *i_hi;
+               const void *i_var;
+               void *i_val;
+               char *i_ext;
+               valet_token_t *token;
+
+               switch_hash_this(hi, &var, NULL, &val);
+               lot = (valet_lot_t *) val;
 
-                       lot = valet_find_lot(m->val);
-                       switch_mutex_lock(lot->mutex);
+               switch_mutex_lock(lot->mutex);
 
-               top:
+       top:
                
-                       for (i_hi = switch_hash_first(NULL, lot->hash); i_hi; i_hi = switch_hash_next(i_hi)) {
-                               switch_hash_this(i_hi, &i_var, NULL, &i_val);
-                               i_ext = (char *) i_var;
-                               token = (valet_token_t *) i_val;
-                               if (token->timeout > 0 && (token->timeout < now || token->timeout == 1)) {
-                                       switch_core_hash_delete(lot->hash, i_ext);
-                                       switch_safe_free(token);
-                                       goto top;
-                               }
+               for (i_hi = switch_hash_first(NULL, lot->hash); i_hi; i_hi = switch_hash_next(i_hi)) {
+                       switch_hash_this(i_hi, &i_var, NULL, &i_val);
+                       i_ext = (char *) i_var;
+                       token = (valet_token_t *) i_val;
+                       if (token->timeout > 0 && (token->timeout < now || token->timeout == 1)) {
+                               switch_core_hash_delete(lot->hash, i_ext);
+                               switch_safe_free(token);
+                               goto top;
                        }
-
-                       switch_mutex_unlock(lot->mutex);
                }
 
-               switch_console_free_matches(&matches);
+               switch_mutex_unlock(lot->mutex);
        }
-
+       switch_mutex_unlock(globals.mutex);
 }
 
 static int next_id(valet_lot_t *lot, int min, int max, int in)