osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

type drange -> drange_t 

explicit casts.

svn path=/trunk/; revision=48083
This commit is contained in:
Anders Broman 2013-03-05 06:16:45 +00:00
parent dd8c596851
commit 7ad305365f
12 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dfilter/dfvm.c
View File

@ -390,7 +390,7 @@ free_register_overhead(dfilter_t* df)
* to make a new list of fvalue_t's (which are ranges, or byte-slices),
* and puts the new list into a new register. */
static void
mk_range(dfilter_t *df, int from_reg, int to_reg, drange *d_range)
mk_range(dfilter_t *df, int from_reg, int to_reg, drange_t *d_range)
{
GList *from_list, *to_list;
fvalue_t *old_fv, *new_fv;

2
epan/dfilter/dfvm.h
View File

@ -47,7 +47,7 @@ typedef struct {
union {
fvalue_t *fvalue;
guint32 numeric;
drange *drange;
drange_t *drange;
header_field_info *hfinfo;
df_func_def_t *funcdef;
} value;

38
epan/dfilter/drange.c
View File

@ -122,11 +122,11 @@ drange_node_set_to_the_end(drange_node* drnode)
}
/* drange constructor */
drange*
drange_t *
drange_new(void)
{
drange* new_drange;
new_drange = g_new(drange,1);
drange_t * new_drange;
new_drange = g_new(drange_t,1);
new_drange->range_list = NULL;
new_drange->has_total_length = TRUE;
new_drange->total_length = 0;
@ -139,25 +139,25 @@ static void
drange_append_wrapper(gpointer data, gpointer user_data)
{
drange_node *drnode = (drange_node *)data;
drange *dr = (drange *)user_data;
drange_t *dr = (drange_t *)user_data;
drange_append_drange_node(dr, drnode);
}
drange*
drange_t *
drange_new_from_list(GSList *list)
{
drange *new_drange;
drange_t *new_drange;
new_drange = drange_new();
g_slist_foreach(list, drange_append_wrapper, new_drange);
return new_drange;
}
drange*
drange_dup(drange *org)
drange_t *
drange_dup(drange_t *org)
{
drange *new_drange;
drange_t *new_drange;
GSList *p;
if (!org)
@ -165,7 +165,7 @@ drange_dup(drange *org)
new_drange = drange_new();
for (p = org->range_list; p; p = p->next) {
drange_node *drnode = p->data;
drange_node *drnode = (drange_node *)p->data;
drange_append_drange_node(new_drange, drange_node_dup(drnode));
}
return new_drange;
@ -180,7 +180,7 @@ drange_node_free_wrapper(gpointer data, gpointer userdata _U_)
/* drange destructor */
void
drange_free(drange* dr)
drange_free(drange_t * dr)
{
drange_node_free_list(dr->range_list);
g_free(dr);
@ -194,13 +194,13 @@ drange_node_free_list(GSList* list)
}
/* drange accessors */
gboolean drange_has_total_length(drange* dr){ return dr->has_total_length; }
gint drange_get_total_length(drange* dr) { return dr->total_length; }
gint drange_get_min_start_offset(drange* dr) { return dr->min_start_offset; }
gint drange_get_max_start_offset(drange* dr) { return dr->max_start_offset; }
gboolean drange_has_total_length(drange_t * dr){ return dr->has_total_length; }
gint drange_get_total_length(drange_t * dr) { return dr->total_length; }
gint drange_get_min_start_offset(drange_t * dr) { return dr->min_start_offset; }
gint drange_get_max_start_offset(drange_t * dr) { return dr->max_start_offset; }
static void
update_drange_with_node(drange *dr, drange_node *drnode)
update_drange_with_node(drange_t *dr, drange_node *drnode)
{
if(drnode->ending == DRANGE_NODE_END_T_TO_THE_END){
dr->has_total_length = FALSE;
@ -218,7 +218,7 @@ update_drange_with_node(drange *dr, drange_node *drnode)
/* drange mutators */
void
drange_prepend_drange_node(drange* dr, drange_node* drnode)
drange_prepend_drange_node(drange_t * dr, drange_node* drnode)
{
if(drnode != NULL){
dr->range_list = g_slist_prepend(dr->range_list,drnode);
@ -227,7 +227,7 @@ drange_prepend_drange_node(drange* dr, drange_node* drnode)
}
void
drange_append_drange_node(drange* dr, drange_node* drnode)
drange_append_drange_node(drange_t * dr, drange_node* drnode)
{
if(drnode != NULL){
dr->range_list = g_slist_append(dr->range_list,drnode);
@ -236,7 +236,7 @@ drange_append_drange_node(drange* dr, drange_node* drnode)
}
void
drange_foreach_drange_node(drange* dr, GFunc func, gpointer funcdata)
drange_foreach_drange_node(drange_t * dr, GFunc func, gpointer funcdata)
{
g_slist_foreach(dr->range_list,func,funcdata);
}

24
epan/dfilter/drange.h
View File

@ -57,7 +57,7 @@ typedef struct _drange {
gint total_length;
gint min_start_offset;
gint max_start_offset;
} drange;
} drange_t;
/* drange_node constructor */
drange_node* drange_node_new(void);
@ -81,24 +81,24 @@ void drange_node_set_end_offset(drange_node* drnode, gint offset);
void drange_node_set_to_the_end(drange_node* drnode);
/* drange constructor */
drange* drange_new(void);
drange* drange_new_from_list(GSList *list);
drange *drange_dup(drange *org);
drange_t * drange_new(void);
drange_t * drange_new_from_list(GSList *list);
drange_t * drange_dup(drange_t *org);
/* drange destructor, only use this if you used drange_new() to creat
* the drange
*/
void drange_free(drange* dr);
void drange_free(drange_t* dr);
/* drange accessors */
gboolean drange_has_total_length(drange* dr);
gint drange_get_total_length(drange* dr);
gint drange_get_min_start_offset(drange* dr);
gint drange_get_max_start_offset(drange* dr);
gboolean drange_has_total_length(drange_t* dr);
gint drange_get_total_length(drange_t* dr);
gint drange_get_min_start_offset(drange_t* dr);
gint drange_get_max_start_offset(drange_t* dr);
/* drange mutators */
void drange_append_drange_node(drange* dr, drange_node* drnode);
void drange_prepend_drange_node(drange* dr, drange_node* drnode);
void drange_foreach_drange_node(drange* dr, GFunc func, gpointer funcdata);
void drange_append_drange_node(drange_t* dr, drange_node* drnode);
void drange_prepend_drange_node(drange_t* dr, drange_node* drnode);
void drange_foreach_drange_node(drange_t* dr, GFunc func, gpointer funcdata);
#endif /* ! __DRANGE_H__ */

4
epan/dfilter/gencode.c
View File

@ -70,7 +70,7 @@ dfw_append_read_tree(dfwork_t *dfw, header_field_info *hfinfo)
/* Keep track of which registers
* were used for which hfinfo's so that we
* can re-use registers. */
reg = GPOINTER_TO_UINT(
reg = GPOINTER_TO_INT(
g_hash_table_lookup(dfw->loaded_fields, hfinfo));
if (reg) {
/* Reg's are stored in has as reg+1, so
@ -82,7 +82,7 @@ dfw_append_read_tree(dfwork_t *dfw, header_field_info *hfinfo)
else {
reg = dfw->next_register++;
g_hash_table_insert(dfw->loaded_fields,
hfinfo, GUINT_TO_POINTER(reg + 1));
hfinfo, GINT_TO_POINTER(reg + 1));
added_new_hfinfo = TRUE;
}

2
epan/dfilter/semcheck.c
View File

@ -198,7 +198,7 @@ mk_fvalue_from_val_string(header_field_info *hfinfo, char *s)
/* TRUE/FALSE *always* exist for FT_BOOLEAN. */
if (hfinfo->type == FT_BOOLEAN) {
if (hfinfo->strings) {
tf = (true_false_string *)hfinfo->strings;
tf = (const true_false_string *)hfinfo->strings;
}
if (g_ascii_strcasecmp(s, tf->true_string) == 0) {

6
epan/dfilter/sttype-function.c
View File

@ -52,14 +52,14 @@ function_new(gpointer funcdef)
static gpointer
function_dup(gconstpointer data)
{
const function_t *org = data;
const function_t *org = (const function_t *)data;
function_t *stfuncrec;
GSList *p;
stfuncrec = function_new(org->funcdef);
stfuncrec = (function_t *)function_new(org->funcdef);
for (p = org->params; p; p = p->next) {
const stnode_t *param = p->data;
const stnode_t *param = (const stnode_t *)p->data;
stfuncrec->params = g_slist_append(stfuncrec->params, stnode_dup(param));
}
return (gpointer) stfuncrec;

10
epan/dfilter/sttype-range.c
View File

@ -34,9 +34,9 @@
#include "sttype-range.h"
typedef struct {
guint32 magic;
guint32 magic;
header_field_info *hfinfo;
drange *drange;
drange_t *drange;
} range_t;
#define RANGE_MAGIC 0xec0990ce
@ -60,10 +60,10 @@ range_new(gpointer junk)
static gpointer
range_dup(gconstpointer data)
{
const range_t *org = data;
const range_t *org = (const range_t *)data;
range_t *range;
range = range_new(NULL);
range = (range_t *)range_new(NULL);
range->hfinfo = org->hfinfo;
range->drange = drange_dup(org->drange);
@ -116,7 +116,7 @@ sttype_range_set1(stnode_t *node, stnode_t *field, drange_node *rn)
}
STTYPE_ACCESSOR(header_field_info*, range, hfinfo, RANGE_MAGIC)
STTYPE_ACCESSOR(drange*, range, drange, RANGE_MAGIC)
STTYPE_ACCESSOR(drange_t*, range, drange, RANGE_MAGIC)
void

2
epan/dfilter/sttype-range.h
View File

@ -28,7 +28,7 @@
#include "drange.h"
STTYPE_ACCESSOR_PROTOTYPE(header_field_info*, range, hfinfo)
STTYPE_ACCESSOR_PROTOTYPE(drange*, range, drange)
STTYPE_ACCESSOR_PROTOTYPE(drange_t*, range, drange)
/* Set a range */
void

4
epan/dfilter/sttype-test.c
View File

@ -53,10 +53,10 @@ test_new(gpointer junk)
static gpointer
test_dup(gconstpointer data)
{
const test_t *org = data;
const test_t *org = (const test_t *)data;
test_t *test;
test = test_new(NULL);
test = (test_t *)test_new(NULL);
test->op = org->op;
test->val1 = stnode_dup(org->val1);
test->val2 = stnode_dup(org->val1);

2
epan/ftypes/ftypes.c
View File

@ -393,7 +393,7 @@ slice_func(gpointer data, gpointer user_data)
/* Returns a new FT_BYTES fvalue_t* if possible, otherwise NULL */
fvalue_t*
fvalue_slice(fvalue_t *fv, drange *d_range)
fvalue_slice(fvalue_t *fv, drange_t *d_range)
{
slice_data_t slice_data;
fvalue_t *new_fv;

2
epan/ftypes/ftypes.h
View File

@ -386,7 +386,7 @@ guint
fvalue_length(fvalue_t *fv);
fvalue_t*
fvalue_slice(fvalue_t *fv, drange *dr);
fvalue_slice(fvalue_t *fv, drange_t *dr);
#ifdef __cplusplus
}