osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Rename find_parameter() to ws_find_media_type_parameter() 

The symbols exported from libs should use less generic. preferably
prefixed names to avoid name collisions with other shared library
symbols.

Change-Id: I8323b3e194a7ee4d61baec0c007342fab6cbde84
Reviewed-on: https://code.wireshark.org/review/17229
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Balint Reczey 2016-08-22 12:59:01 +02:00 committed by Michael Mann
parent 22e421f7d3
commit c43b8b5ef9
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-isup.c
View File

@ -10429,8 +10429,8 @@ dissect_application_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
if (data) {
http_message_info_t *message_info = (http_message_info_t *)data;
if (message_info->media_str) {
version = find_parameter(message_info->media_str, "version=", &len_version);
base = find_parameter(message_info->media_str, "base=", &len_base);
version = ws_find_media_type_parameter(message_info->media_str, "version=", &len_version);
base = ws_find_media_type_parameter(message_info->media_str, "base=", &len_base);
if ((version && len_version >= 4 && g_ascii_strncasecmp(version, "ansi", 4) == 0) ||
(base && len_base >= 4 && g_ascii_strncasecmp(base, "ansi", 4) == 0)) {
/*

10
epan/dissectors/packet-multipart.c
View File

@ -346,13 +346,13 @@ get_multipart_info(packet_info *pinfo, http_message_info_t *message_info)
/* Clean up the parameters */
parameters = unfold_and_compact_mime_header(message_info->media_str, &dummy);
start_boundary = find_parameter(parameters, "boundary=", &len_boundary);
start_boundary = ws_find_media_type_parameter(parameters, "boundary=", &len_boundary);
if(!start_boundary) {
return NULL;
}
if(strncmp(type, "multipart/encrypted", sizeof("multipart/encrypted")-1) == 0) {
start_protocol = find_parameter(parameters, "protocol=", &len_protocol);
start_protocol = ws_find_media_type_parameter(parameters, "protocol=", &len_protocol);
if(!start_protocol) {
return NULL;
}
@ -646,7 +646,7 @@ process_body_part(proto_tree *tree, tvbuff_t *tvb,
{
gint semicolon_offset;
/* The Content-Type starts at colon_offset + 1 or after the type parameter */
char* type_str = find_parameter(value_str, "type=", NULL);
char* type_str = ws_find_media_type_parameter(value_str, "type=", NULL);
if(type_str != NULL) {
value_str = type_str;
}
@ -682,7 +682,7 @@ process_body_part(proto_tree *tree, tvbuff_t *tvb,
proto_item_append_text(ti, " (%s)", content_type_str);
/* find the "name" parameter in case we don't find a content disposition "filename" */
if((mimetypename = find_parameter(message_info.media_str, "name=", &len)) != NULL) {
if((mimetypename = ws_find_media_type_parameter(message_info.media_str, "name=", &len)) != NULL) {
mimetypename = g_strndup(mimetypename, len);
}
@ -715,7 +715,7 @@ process_body_part(proto_tree *tree, tvbuff_t *tvb,
case POS_CONTENT_DISPOSITION:
{
/* find the "filename" parameter */
if((filename = find_parameter(value_str, "filename=", &len)) != NULL) {
if((filename = ws_find_media_type_parameter(value_str, "filename=", &len)) != NULL) {
filename = g_strndup(filename, len);
}
}

2
epan/media_params.c
View File

@ -53,7 +53,7 @@ index_of_char(const char *str, const char c)
}
char *
find_parameter(const char *parameters, const char *key, int *retlen)
ws_find_media_type_parameter(const char *parameters, const char *key, int *retlen)
{
const char *start, *p;
int keylen = 0;

2
epan/media_params.h
View File

@ -43,7 +43,7 @@ WS_DLL_PUBLIC gint
index_of_char(const char *str, const char c);
WS_DLL_PUBLIC char *
find_parameter(const char *parameters, const char *key, int *retlen);
ws_find_media_type_parameter(const char *parameters, const char *key, int *retlen);
#ifdef __cplusplus
}