kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve whitespace and formatting 

Modified-by: Travis Cross <tc@traviscross.com>
Signed-off-by: Travis Cross <tc@traviscross.com>
This commit is contained in:
Viktor Krykun 2012-06-15 10:23:13 +03:00 committed by Travis Cross
parent fc98238dd6
commit 272b36d04b
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/libzrtp/src/zrtp.c
View File

@ -1129,7 +1129,7 @@ char* zrtp_comp_id2type(zrtp_crypto_comp_t type, uint8_t id)
case ZRTP_ATL_HS32: return ZRTP_HS32; case ZRTP_ATL_HS32: return ZRTP_HS32;
case ZRTP_ATL_HS80: return ZRTP_HS80; case ZRTP_ATL_HS80: return ZRTP_HS80;
default: return "Unkn"; default: return "Unkn";
} }
default: default:
return "Unkn"; return "Unkn";

15
libs/libzrtp/src/zrtp_iface_cache.c
View File

@ -56,7 +56,6 @@ static zrtp_status_t zrtp_cache_user_down();
return zrtp_status_bad_param; \ return zrtp_status_bad_param; \
} }
/*----------------------------------------------------------------------------*/
zrtp_status_t zrtp_def_cache_init(zrtp_global_t* a_zrtp) zrtp_status_t zrtp_def_cache_init(zrtp_global_t* a_zrtp)
{ {
zrtp_status_t s = zrtp_status_ok; zrtp_status_t s = zrtp_status_ok;
@ -102,7 +101,7 @@ void zrtp_def_cache_down()
} }
} }
/*----------------------------------------------------------------------------*/
zrtp_status_t zrtp_def_cache_set_verified( const zrtp_stringn_t* one_ZID, zrtp_status_t zrtp_def_cache_set_verified( const zrtp_stringn_t* one_ZID,
const zrtp_stringn_t* another_ZID, const zrtp_stringn_t* another_ZID,
uint32_t verified) uint32_t verified)
@ -117,7 +116,7 @@ zrtp_status_t zrtp_def_cache_set_verified( const zrtp_stringn_t* one_ZID,
new_elem = get_elem(id, 0); new_elem = get_elem(id, 0);
if (new_elem) { if (new_elem) {
new_elem->verified = verified; new_elem->verified = verified;
} }
zrtp_mutex_unlock(def_cache_protector); zrtp_mutex_unlock(def_cache_protector);
return (new_elem) ? zrtp_status_ok : zrtp_status_fail; return (new_elem) ? zrtp_status_ok : zrtp_status_fail;
@ -145,7 +144,6 @@ zrtp_status_t zrtp_def_cache_get_verified( const zrtp_stringn_t* one_ZID,
} }
/*----------------------------------------------------------------------------*/
static zrtp_status_t cache_put( const zrtp_stringn_t* one_ZID, static zrtp_status_t cache_put( const zrtp_stringn_t* one_ZID,
const zrtp_stringn_t* another_ZID, const zrtp_stringn_t* another_ZID,
zrtp_shared_secret_t *rss, zrtp_shared_secret_t *rss,
@ -229,7 +227,6 @@ zrtp_status_t zrtp_def_cache_put_mitm( const zrtp_stringn_t* one_ZID,
} }
/*----------------------------------------------------------------------------*/
static zrtp_status_t cache_get( const zrtp_stringn_t* one_ZID, static zrtp_status_t cache_get( const zrtp_stringn_t* one_ZID,
const zrtp_stringn_t* another_ZID, const zrtp_stringn_t* another_ZID,
zrtp_shared_secret_t *rss, zrtp_shared_secret_t *rss,
@ -288,7 +285,6 @@ zrtp_status_t zrtp_def_cache_get_mitm( const zrtp_stringn_t* one_ZID,
return cache_get(one_ZID, another_ZID, rss, 0, 1); return cache_get(one_ZID, another_ZID, rss, 0, 1);
} }
/*-----------------------------------------------------------------------------*/
zrtp_status_t zrtp_def_cache_set_presh_counter( const zrtp_stringn_t* one_zid, zrtp_status_t zrtp_def_cache_set_presh_counter( const zrtp_stringn_t* one_zid,
const zrtp_stringn_t* another_zid, const zrtp_stringn_t* another_zid,
uint32_t counter) uint32_t counter)
@ -331,7 +327,6 @@ zrtp_status_t zrtp_def_cache_get_presh_counter( const zrtp_stringn_t* one_zid,
return (new_elem) ? zrtp_status_ok : zrtp_status_fail; return (new_elem) ? zrtp_status_ok : zrtp_status_fail;
} }
/*-----------------------------------------------------------------------------*/
void zrtp_cache_create_id( const zrtp_stringn_t* first_ZID, void zrtp_cache_create_id( const zrtp_stringn_t* first_ZID,
const zrtp_stringn_t* second_ZID, const zrtp_stringn_t* second_ZID,
zrtp_cache_id_t id ) zrtp_cache_id_t id )
@ -346,13 +341,12 @@ zrtp_status_t zrtp_def_cache_get_presh_counter( const zrtp_stringn_t* one_zid,
zrtp_memcpy((char*)id+sizeof(zrtp_zid_t), second_ZID->buffer, sizeof(zrtp_zid_t)); zrtp_memcpy((char*)id+sizeof(zrtp_zid_t), second_ZID->buffer, sizeof(zrtp_zid_t));
} }
/*-----------------------------------------------------------------------------*/
zrtp_cache_elem_t* zrtp_def_cache_get2(const zrtp_cache_id_t id, int is_mitm) zrtp_cache_elem_t* zrtp_def_cache_get2(const zrtp_cache_id_t id, int is_mitm)
{ {
return get_elem(id, is_mitm); return get_elem(id, is_mitm);
} }
/*-----------------------------------------------------------------------------*/
static zrtp_cache_elem_t* get_elem(const zrtp_cache_id_t id, uint8_t is_mitm) static zrtp_cache_elem_t* get_elem(const zrtp_cache_id_t id, uint8_t is_mitm)
{ {
mlist_t* node = NULL; mlist_t* node = NULL;
@ -367,7 +361,6 @@ static zrtp_cache_elem_t* get_elem(const zrtp_cache_id_t id, uint8_t is_mitm)
return NULL; return NULL;
} }
/*----------------------------------------------------------------------------*/
static void cache_make_cross(zrtp_cache_elem_t* from, zrtp_cache_elem_t* to, uint8_t is_upload) static void cache_make_cross(zrtp_cache_elem_t* from, zrtp_cache_elem_t* to, uint8_t is_upload)
{ {
if (!to) { if (!to) {
@ -576,7 +569,7 @@ zrtp_status_t zrtp_cache_user_init()
return s; return s;
} }
/*---------------------------------------------------------------------------*/
#define ZRTP_DOWN_CACHE_RETURN(s, f) \ #define ZRTP_DOWN_CACHE_RETURN(s, f) \
{\ {\
if (zrtp_status_ok != s) { \ if (zrtp_status_ok != s) { \