devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Format code correctly

Browse Source
This commit is contained in:
Michael Vetter
2021-10-05 10:01:27 +02:00
parent 7e8cf4a3d6
commit f21595597f
28 changed files with 97 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/xmpp/avatar.c
View File

@@ -154,11 +154,11 @@ _avatar_metadata_handler(xmpp_stanza_t* const stanza, void* const userdata)
const char* id = xmpp_stanza_get_id(info);
const char* type = xmpp_stanza_get_attribute(info, "type");
if(id && type) {
if (id && type) {
log_debug("Avatar ID for %s is: %s", from, id);
avatar_metadata* data = malloc(sizeof(avatar_metadata));
if(data) {
if (data) {
data->type = strdup(type);
data->id = strdup(id);

6
src/xmpp/connection.c
View File

@@ -522,7 +522,7 @@ connection_create_stanza_id(void)
(guchar*)prof_identifier, strlen(prof_identifier),
rndid, strlen(rndid));
char *ret = g_strdup_printf("%s%s", rndid, hmac);
char* ret = g_strdup_printf("%s%s", rndid, hmac);
free(rndid);
g_free(hmac);
@@ -746,8 +746,8 @@ _compute_identifier(const char* barejid)
free(prof_identifier);
prof_identifier = g_compute_hmac_for_string(G_CHECKSUM_SHA256,
(guchar*)profanity_instance_id, strlen(profanity_instance_id),
barejid, strlen(barejid));
(guchar*)profanity_instance_id, strlen(profanity_instance_id),
barejid, strlen(barejid));
}
const char*

15
src/xmpp/iq.c
View File

@@ -2343,7 +2343,7 @@ _disco_info_response_id_handler(xmpp_stanza_t* const stanza, void* const userdat
}
}
} else if (g_strcmp0(child_type, STANZA_TYPE_RESULT) == 0) {
GHashTable *adr = stanza_get_service_contact_addresses(connection_get_ctx(), child);
GHashTable* adr = stanza_get_service_contact_addresses(connection_get_ctx(), child);
cons_show_disco_contact_information(adr);
g_hash_table_destroy(adr);
}
@@ -2456,14 +2456,11 @@ _http_upload_response_id_handler(xmpp_stanza_t* const stanza, void* const userda
const char* header_name = xmpp_stanza_get_attribute(header, STANZA_ATTR_NAME);
if (g_strcmp0(header_name, STANZA_HEADER_AUTHORIZATION) == 0) {
upload->authorization = xmpp_stanza_get_text(header);
}
else if (g_strcmp0(header_name, STANZA_HEADER_COOKIE) == 0) {
} else if (g_strcmp0(header_name, STANZA_HEADER_COOKIE) == 0) {
upload->cookie = xmpp_stanza_get_text(header);
}
else if (g_strcmp0(header_name, STANZA_HEADER_EXPIRES) == 0) {
} else if (g_strcmp0(header_name, STANZA_HEADER_EXPIRES) == 0) {
upload->expires = xmpp_stanza_get_text(header);
}
else {
} else {
log_warning("[HTTP upload] unknown header: %s", header_name);
}
}
@@ -2629,8 +2626,8 @@ _mam_rsm_id_handler(xmpp_stanza_t* const stanza, void* const userdata)
if (fin) {
xmpp_stanza_t* set = xmpp_stanza_get_child_by_name_and_ns(fin, STANZA_TYPE_SET, STANZA_NS_RSM);
if (set) {
char *lastid = NULL;
xmpp_stanza_t* last = xmpp_stanza_get_child_by_name(set, STANZA_NAME_LAST);
char* lastid = NULL;
xmpp_stanza_t* last = xmpp_stanza_get_child_by_name(set, STANZA_NAME_LAST);
if (last) {
lastid = xmpp_stanza_get_text(last);
}

17
src/xmpp/omemo.c
View File

@@ -145,9 +145,9 @@ omemo_bundle_publish(gboolean first)
if (connection_supports(XMPP_FEATURE_PUBSUB_PUBLISH_OPTIONS)) {
stanza_attach_publish_options_va(ctx, iq,
4, // 2 * number of key-value pairs
"pubsub#persist_items", "true",
"pubsub#access_model", "open");
4, // 2 * number of key-value pairs
"pubsub#persist_items", "true",
"pubsub#access_model", "open");
}
iq_id_handler_add(id, _omemo_bundle_publish_result, NULL, GINT_TO_POINTER(first));
@@ -190,7 +190,7 @@ omemo_start_device_session_handle_bundle(xmpp_stanza_t* const stanza, void* cons
log_debug("[OMEMO] omemo_start_device_session_handle_bundle: %s", from_attr);
const char* type = xmpp_stanza_get_type(stanza);
if ( g_strcmp0( type, "error") == 0 ) {
if (g_strcmp0(type, "error") == 0) {
log_error("[OMEMO] Error to get key for a device from : %s", from_attr);
}
@@ -555,13 +555,13 @@ _omemo_devicelist_publish_result(xmpp_stanza_t* const stanza, void* const userda
if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) {
log_error("[OMEMO] Publishing device list failed");
xmpp_stanza_t *error = xmpp_stanza_get_child_by_name(stanza, "error");
xmpp_stanza_t* error = xmpp_stanza_get_child_by_name(stanza, "error");
if (!error) {
log_error("[OMEMO] Missing error element in device list publication result");
return 0;
}
xmpp_stanza_t *pubsub_error = xmpp_stanza_get_child_by_ns(error, STANZA_NS_PUBSUB_ERROR);
xmpp_stanza_t* pubsub_error = xmpp_stanza_get_child_by_ns(error, STANZA_NS_PUBSUB_ERROR);
if (!pubsub_error) {
log_error("[OMEMO] Unknown error while publishing our own device list");
cons_show_error("Unknown error while publishing our own device list");
@@ -606,7 +606,7 @@ _omemo_devicelist_configure_submit(xmpp_stanza_t* const stanza, void* const user
}
DataForm* form = form_create(x);
form_set_value(form, "pubsub#access_model", "open");
form_set_value(form, "pubsub#access_model", "open");
xmpp_ctx_t* const ctx = connection_get_ctx();
Jid* jid = jid_create(connection_get_fulljid());
@@ -644,7 +644,6 @@ _omemo_devicelist_configure_result(xmpp_stanza_t* const stanza, void* const user
return 0;
}
static int
_omemo_bundle_publish_result(xmpp_stanza_t* const stanza, void* const userdata)
{
@@ -704,7 +703,7 @@ _omemo_bundle_publish_configure(xmpp_stanza_t* const stanza, void* const userdat
}
DataForm* form = form_create(x);
form_set_value(form, "pubsub#access_model", "open");
form_set_value(form, "pubsub#access_model", "open");
xmpp_ctx_t* const ctx = connection_get_ctx();
Jid* jid = jid_create(connection_get_fulljid());

4
src/xmpp/ox.c
View File

@@ -123,7 +123,7 @@ ox_announce_public_key(const char* const filename)
xmpp_stanza_t* item = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(item, STANZA_NAME_ITEM);
char *timestamp = _gettimestamp();
char* timestamp = _gettimestamp();
xmpp_stanza_set_attribute(item, STANZA_ATTR_ID, timestamp);
free(timestamp);
@@ -305,7 +305,7 @@ _ox_metadata_result(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void*
while (pubkeymetadata) {
const char* fingerprint = xmpp_stanza_get_attribute(pubkeymetadata, STANZA_ATTR_V4_FINGERPRINT);
if ( strlen( fingerprint ) == KEYID_LENGTH ) {
if (strlen(fingerprint) == KEYID_LENGTH) {
cons_show(fingerprint);
} else {
cons_show("OX: Wrong char size of public key");

10
src/xmpp/stanza.c
View File

@@ -1947,7 +1947,7 @@ stanza_attach_publish_options_va(xmpp_ctx_t* const ctx, xmpp_stanza_t* const iq,
int j;
for (j = 0; j < count; j += 2) {
const char* const option = va_arg(ap, char* const);
const char* const value = va_arg(ap, char* const);
const char* const value = va_arg(ap, char* const);
xmpp_stanza_t* field = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(field, STANZA_NAME_FIELD);
@@ -1966,7 +1966,6 @@ stanza_attach_publish_options_va(xmpp_ctx_t* const ctx, xmpp_stanza_t* const iq,
}
va_end(ap);
xmpp_stanza_release(form_type_value_text);
xmpp_stanza_release(form_type_value);
xmpp_stanza_release(form_type);
@@ -1980,7 +1979,6 @@ stanza_attach_publish_options(xmpp_ctx_t* const ctx, xmpp_stanza_t* const iq, co
stanza_attach_publish_options_va(ctx, iq, 2, option, value);
}
void
stanza_attach_priority(xmpp_ctx_t* const ctx, xmpp_stanza_t* const presence, const int pri)
{
@@ -2324,7 +2322,7 @@ stanza_create_omemo_devicelist_publish(xmpp_ctx_t* ctx, GList* const ids)
xmpp_stanza_set_name(list, "list");
xmpp_stanza_set_ns(list, "eu.siacs.conversations.axolotl");
for (GList *i = ids; i != NULL; i = i->next) {
for (GList* i = ids; i != NULL; i = i->next) {
xmpp_stanza_t* device = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(device, "device");
char* id = g_strdup_printf("%d", GPOINTER_TO_INT(i->data));
@@ -2608,7 +2606,7 @@ stanza_attach_correction(xmpp_ctx_t* ctx, xmpp_stanza_t* stanza, const char* con
}
xmpp_stanza_t*
stanza_create_mam_iq(xmpp_ctx_t* ctx, const char* const jid, const char* const startdate, const char *const lastid)
stanza_create_mam_iq(xmpp_ctx_t* ctx, const char* const jid, const char* const startdate, const char* const lastid)
{
char* id = connection_create_stanza_id();
xmpp_stanza_t* iq = xmpp_iq_new(ctx, STANZA_TYPE_SET, id);
@@ -2859,7 +2857,7 @@ stanza_get_service_contact_addresses(xmpp_ctx_t* ctx, xmpp_stanza_t* stanza)
if (g_strcmp0(child_name, STANZA_NAME_FIELD) == 0 && g_strcmp0(child_type, STANZA_TYPE_LIST_MULTI) == 0) {
// extract key (eg 'admin-addresses')
const char* var = xmpp_stanza_get_attribute(fields, STANZA_ATTR_VAR );
const char* var = xmpp_stanza_get_attribute(fields, STANZA_ATTR_VAR);
// extract values (a list of contact addresses eg mailto:xmpp@shakespeare.lit, xmpp:admins@shakespeare.lit)
xmpp_stanza_t* values = xmpp_stanza_get_children(fields);

2
src/xmpp/xmpp.h
View File

@@ -165,7 +165,7 @@ typedef struct prof_message_t
/* stanza-id from XEP 0359. Used for MAM. archive_id in our database (see database.c)
* coming in as <stanza-id> for live messages
* coming in as <result id=""> for MAM messages*/
char *stanzaid;
char* stanzaid;
/* The raw body from xmpp message, either plaintext or OTR encrypted text */
char* body;
/* The encrypted message as for PGP */