diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-08-06 02:02:03 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-08-06 02:02:03 +0200 |
| commit | d39e08cc5483dc924f3b764b87042fb6aebb722d (patch) | |
| tree | 32ef5b7b9201a631f1bb09e202b3dd70db8ac44b /src | |
| parent | 752eb63024b86444a8395954ff51d5eaf7d77550 (diff) | |
Convert SDP *_safe functions to default API
Diffstat (limited to 'src')
| -rw-r--r-- | src/adapter.c | 4 | ||||
| -rw-r--r-- | src/sdpd-request.c | 4 | ||||
| -rw-r--r-- | src/sdpd-service.c | 4 | ||||
| -rw-r--r-- | src/storage.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/adapter.c b/src/adapter.c index efc66c2e..d0ae3190 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -2143,11 +2143,11 @@ static void create_stored_records_from_keys(char *key, char *value, pdata = g_malloc0(size); for (i = 0; i < size; i++) { - memcpy(tmp, value + (i*2), 2); + memcpy(tmp, value + (i * 2), 2); pdata[i] = (uint8_t) strtol(tmp, NULL, 16); } - rec = sdp_extract_pdu(pdata, &len); + rec = sdp_extract_pdu(pdata, size, &len); free(pdata); rec_list->recs = sdp_list_append(rec_list->recs, rec); diff --git a/src/sdpd-request.c b/src/sdpd-request.c index ece8cd54..3ddf25ce 100644 --- a/src/sdpd-request.c +++ b/src/sdpd-request.c @@ -106,7 +106,7 @@ static int extract_des(uint8_t *buf, int len, sdp_list_t **svcReqSeq, uint8_t *p const uint8_t *p; int bufsize; - scanned = sdp_extract_seqtype_safe(buf, len, &seqType, &data_size); + scanned = sdp_extract_seqtype(buf, len, &seqType, &data_size); debug("Seq type : %d", seqType); if (!scanned || (seqType != SDP_SEQ8 && seqType != SDP_SEQ16)) { @@ -175,7 +175,7 @@ static int extract_des(uint8_t *buf, int len, sdp_list_t **svcReqSeq, uint8_t *p case SDP_UUID32: case SDP_UUID128: pElem = malloc(sizeof(uuid_t)); - status = sdp_uuid_extract_safe(p, bufsize, (uuid_t *) pElem, &localSeqLength); + status = sdp_uuid_extract(p, bufsize, (uuid_t *) pElem, &localSeqLength); if (status == 0) { seqlen += localSeqLength; p += localSeqLength; diff --git a/src/sdpd-service.c b/src/sdpd-service.c index 09459f43..cf120b89 100644 --- a/src/sdpd-service.c +++ b/src/sdpd-service.c @@ -440,7 +440,7 @@ static sdp_record_t *extract_pdu_server(bdaddr_t *device, uint8_t *p, int bufsiz sdp_data_t *pAttr = NULL; uint32_t handle = 0xffffffff; - *scanned = sdp_extract_seqtype_safe(p, bufsize, &dtd, &seqlen); + *scanned = sdp_extract_seqtype(p, bufsize, &dtd, &seqlen); p += *scanned; bufsize -= *scanned; @@ -498,7 +498,7 @@ static sdp_record_t *extract_pdu_server(bdaddr_t *device, uint8_t *p, int bufsiz debug("DTD of attrId : %d Attr id : 0x%x", dtd, attrId); - pAttr = sdp_extract_attr_safe(p + attrSize, bufsize - attrSize, + pAttr = sdp_extract_attr(p + attrSize, bufsize - attrSize, &attrValueLength, rec); debug("Attr id : 0x%x attrValueLength : %d", attrId, attrValueLength); diff --git a/src/storage.c b/src/storage.c index ded9a535..f8064254 100644 --- a/src/storage.c +++ b/src/storage.c @@ -756,7 +756,7 @@ sdp_record_t *fetch_record(const gchar *src, const gchar *dst, const uint32_t ha if (!str) return NULL; - size = strlen(str)/2; + size = strlen(str) / 2; pdata = g_malloc0(size); for (i = 0; i < size; i++) { @@ -764,7 +764,7 @@ sdp_record_t *fetch_record(const gchar *src, const gchar *dst, const uint32_t ha pdata[i] = (uint8_t) strtol(tmp, NULL, 16); } - rec = sdp_extract_pdu(pdata, &len); + rec = sdp_extract_pdu(pdata, size, &len); free(str); free(pdata); |