Changeset 5560 for wire

Show
Ignore:
Timestamp:
06/01/08 23:18:58 (4 months ago)
Author:
morris
Message:

hash -> dictionary

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • wire/trunk/wire/chats.c

    r5079 r5560  
    4545        wr_cid_t                                                cid; 
    4646        wi_array_t                                              *users_array; 
    47         wi_hash_t                                              *users_hash; 
     47        wi_dictionary_t                                        *users_dictionary; 
    4848};   
    4949 
    …… 
    5959wr_uid_t                                                        wr_private_chat_invite_uid; 
    6060 
    61 static wi_hash_t                                      *wr_chats; 
     61static wi_dictionary_t                                *wr_chats; 
    6262 
    6363static wi_runtime_id_t                          wr_chat_runtime_id = WI_RUNTIME_ID_NULL; 
    …… 
    7575        wr_chat_runtime_id = wi_runtime_register_class(&wr_chat_runtime_class); 
    7676 
    77         wr_chats = wi_hash_init(wi_hash_alloc()); 
     77        wr_chats = wi_dictionary_init(wi_dictionary_alloc()); 
    7878         
    7979        wr_public_chat = wr_chat_init_public_chat(wr_chat_alloc()); 
    …… 
    8484 
    8585void wr_chats_clear(void) { 
    86         wi_hash_remove_all_data(wr_chats); 
     86        wi_dictionary_remove_all_data(wr_chats); 
    8787        wr_chat_remove_all_users(wr_public_chat); 
    8888        wr_chats_add_chat(wr_public_chat); 
    …… 
    9999 
    100100void wr_chats_add_chat(wr_chat_t *chat) { 
    101         wi_hash_set_data_for_key(wr_chats, chat, wi_number_with_integer(chat->cid)); 
     101        wi_dictionary_set_data_for_key(wr_chats, chat, wi_number_with_integer(chat->cid)); 
    102102} 
    103103 
    …… 
    105105 
    106106void wr_chats_remove_chat(wr_chat_t *chat) { 
    107         wi_hash_remove_data_for_key(wr_chats, wi_number_with_integer(chat->cid)); 
     107        wi_dictionary_remove_data_for_key(wr_chats, wi_number_with_integer(chat->cid)); 
    108108} 
    109109 
    …… 
    111111 
    112112wr_chat_t * wr_chats_chat_with_cid(wr_cid_t cid) { 
    113         return wi_hash_data_for_key(wr_chats, wi_number_with_integer(cid)); 
     113        return wi_dictionary_data_for_key(wr_chats, wi_number_with_integer(cid)); 
    114114} 
    115115 
    …… 
    125125 
    126126wr_chat_t * wr_chat_init(wr_chat_t *chat) { 
    127         chat->users_array       = wi_array_init(wi_array_alloc()); 
    128         chat->users_hash       = wi_hash_init(wi_hash_alloc()); 
     127        chat->users_array              = wi_array_init(wi_array_alloc()); 
     128        chat->users_dictionary = wi_dictionary_init(wi_dictionary_alloc()); 
    129129         
    130130        return chat; 
    …… 
    152152         
    153153        wi_release(chat->users_array); 
    154         wi_release(chat->users_hash); 
     154        wi_release(chat->users_dictionary); 
    155155} 
    156156 
    …… 
    212212void wr_chat_add_user(wr_chat_t *chat, wr_user_t *user) { 
    213213        wi_array_add_data(chat->users_array, user); 
    214         wi_hash_set_data_for_key(chat->users_hash, user, wi_number_with_integer(wr_user_id(user))); 
     214        wi_dictionary_set_data_for_key(chat->users_dictionary, user, wi_number_with_integer(wr_user_id(user))); 
    215215} 
    216216 
    …… 
    219219void wr_chat_remove_user(wr_chat_t *chat, wr_user_t *user) { 
    220220        wi_array_remove_data(chat->users_array, user); 
    221         wi_hash_remove_data_for_key(chat->users_hash, wi_number_with_integer(wr_user_id(user))); 
     221        wi_dictionary_remove_data_for_key(chat->users_dictionary, wi_number_with_integer(wr_user_id(user))); 
    222222} 
    223223 
    …… 
    226226void wr_chat_remove_all_users(wr_chat_t *chat) { 
    227227        wi_array_remove_all_data(chat->users_array); 
    228         wi_hash_remove_all_data(chat->users_hash); 
     228        wi_dictionary_remove_all_data(chat->users_dictionary); 
    229229} 
    230230 
    …… 
    232232 
    233233wr_user_t * wr_chat_user_with_uid(wr_chat_t *chat, wr_uid_t uid) { 
    234         return wi_hash_data_for_key(chat->users_hash, wi_number_with_integer(uid)); 
     234        return wi_dictionary_data_for_key(chat->users_dictionary, wi_number_with_integer(uid)); 
    235235} 
    236236