diff options
| author | Siraj Razick <siraj.razick@collabora.co.uk> | 2012-03-25 12:47:11 -0400 |
|---|---|---|
| committer | Siraj Razick <siraj.razick@collabora.co.uk> | 2012-03-26 10:31:35 -0400 |
| commit | cbb9922cadf0306f0605e5ae3a4d3eb976f6a0f9 (patch) | |
| tree | 23ec6b775028e5b38681181fc4630314b984606d | |
| parent | 3386256c58474da4a324b540a20c0f17d773ac2d (diff) | |
| download | telepathy-salut-cbb9922cadf0306f0605e5ae3a4d3eb976f6a0f9.tar.gz | |
bonjour-contact: Avoid passing pointer to pointer into GetValuePtr
TXTRecordGetValuePtr expects a pointer to a char not a pointer to a
pointer
| -rw-r--r-- | src/bonjour-contact.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/bonjour-contact.c b/src/bonjour-contact.c index a3091adf..4d4f6834 100644 --- a/src/bonjour-contact.c +++ b/src/bonjour-contact.c @@ -487,7 +487,7 @@ _bonjour_getaddr_cb (DNSServiceRef service_ref, /* status */ tmp = (char *) TXTRecordGetValuePtr - (txt_length, &txt_record, "status", &txt_len); + (txt_length, txt_record, "status", &txt_len); status = g_strndup (tmp, txt_len); if (status != NULL) @@ -504,20 +504,20 @@ _bonjour_getaddr_cb (DNSServiceRef service_ref, } /* status message */ - tmp = (char *) TXTRecordGetValuePtr (txt_length, &txt_record, + tmp = (char *) TXTRecordGetValuePtr (txt_length, txt_record, "msg", &txt_len); status_message = g_strndup (tmp, txt_len); salut_contact_change_status_message (contact, status_message); free (status_message); /* real name and nick */ - tmp = (char *) TXTRecordGetValuePtr (txt_length, &txt_record, + tmp = (char *) TXTRecordGetValuePtr (txt_length, txt_record, "nick", &txt_len); nick = g_strndup (tmp, txt_len); - tmp = (char *) TXTRecordGetValuePtr (txt_length, &txt_record, + tmp = (char *) TXTRecordGetValuePtr (txt_length, txt_record, "1st", &txt_len); first = g_strndup (tmp, txt_len); - tmp = (char *) TXTRecordGetValuePtr (txt_length, &txt_record, + tmp = (char *) TXTRecordGetValuePtr (txt_length, txt_record, "last", &txt_len); last = g_strndup (tmp, txt_len); @@ -543,16 +543,15 @@ _bonjour_getaddr_cb (DNSServiceRef service_ref, salut_contact_change_capabilities (contact, hash, node, ver); - DEBUG ("%s", txt_record); free (hash); free (node); free (ver); /* email */ - tmp = (char *) TXTRecordGetValuePtr (txt_length, &txt_record, + tmp = (char *) TXTRecordGetValuePtr (txt_length, txt_record, "email", &txt_len); email = g_strndup (tmp, txt_len); - tmp = (char *) TXTRecordGetValuePtr (txt_length, &txt_record, + tmp = (char *) TXTRecordGetValuePtr (txt_length, txt_record, "jid", &txt_len); jid = g_strndup (tmp, txt_len); |