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

fix some more warnings 

svn path=/trunk/; revision=21105
This commit is contained in:
Ulf Lamping 2007-03-22 00:49:06 +00:00
parent 3e32597719
commit b323125a9c
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
epan/column-utils.c
View File

@ -622,32 +622,32 @@ col_set_rel_time(frame_data *fd, column_info *cinfo, int col)
case(TS_PREC_FIXED_SEC):
case(TS_PREC_AUTO_SEC):
display_signed_time(cinfo->col_buf[col], COL_MAX_LEN,
fd->rel_ts.secs, fd->rel_ts.nsecs / 1000000000, SECS);
(gint32) fd->rel_ts.secs, fd->rel_ts.nsecs / 1000000000, SECS);
break;
case(TS_PREC_FIXED_DSEC):
case(TS_PREC_AUTO_DSEC):
display_signed_time(cinfo->col_buf[col], COL_MAX_LEN,
fd->rel_ts.secs, fd->rel_ts.nsecs / 100000000, DSECS);
(gint32) fd->rel_ts.secs, fd->rel_ts.nsecs / 100000000, DSECS);
break;
case(TS_PREC_FIXED_CSEC):
case(TS_PREC_AUTO_CSEC):
display_signed_time(cinfo->col_buf[col], COL_MAX_LEN,
fd->rel_ts.secs, fd->rel_ts.nsecs / 10000000, CSECS);
(gint32) fd->rel_ts.secs, fd->rel_ts.nsecs / 10000000, CSECS);
break;
case(TS_PREC_FIXED_MSEC):
case(TS_PREC_AUTO_MSEC):
display_signed_time(cinfo->col_buf[col], COL_MAX_LEN,
fd->rel_ts.secs, fd->rel_ts.nsecs / 1000000, MSECS);
(gint32) fd->rel_ts.secs, fd->rel_ts.nsecs / 1000000, MSECS);
break;
case(TS_PREC_FIXED_USEC):
case(TS_PREC_AUTO_USEC):
display_signed_time(cinfo->col_buf[col], COL_MAX_LEN,
fd->rel_ts.secs, fd->rel_ts.nsecs / 1000, USECS);
(gint32) fd->rel_ts.secs, fd->rel_ts.nsecs / 1000, USECS);
break;
case(TS_PREC_FIXED_NSEC):
case(TS_PREC_AUTO_NSEC):
display_signed_time(cinfo->col_buf[col], COL_MAX_LEN,
fd->rel_ts.secs, fd->rel_ts.nsecs, NSECS);
(gint32) fd->rel_ts.secs, fd->rel_ts.nsecs, NSECS);
break;
default:
g_assert_not_reached();
@ -666,32 +666,32 @@ col_set_delta_time(frame_data *fd, column_info *cinfo, int col)
case(TS_PREC_FIXED_SEC):
case(TS_PREC_AUTO_SEC):
display_signed_time(cinfo->col_buf[col], COL_MAX_LEN,
fd->del_ts.secs, fd->del_ts.nsecs / 1000000000, SECS);
(gint32) fd->del_ts.secs, fd->del_ts.nsecs / 1000000000, SECS);
break;
case(TS_PREC_FIXED_DSEC):
case(TS_PREC_AUTO_DSEC):
display_signed_time(cinfo->col_buf[col], COL_MAX_LEN,
fd->del_ts.secs, fd->del_ts.nsecs / 100000000, DSECS);
(gint32) fd->del_ts.secs, fd->del_ts.nsecs / 100000000, DSECS);
break;
case(TS_PREC_FIXED_CSEC):
case(TS_PREC_AUTO_CSEC):
display_signed_time(cinfo->col_buf[col], COL_MAX_LEN,
fd->del_ts.secs, fd->del_ts.nsecs / 10000000, CSECS);
(gint32) fd->del_ts.secs, fd->del_ts.nsecs / 10000000, CSECS);
break;
case(TS_PREC_FIXED_MSEC):
case(TS_PREC_AUTO_MSEC):
display_signed_time(cinfo->col_buf[col], COL_MAX_LEN,
fd->del_ts.secs, fd->del_ts.nsecs / 1000000, MSECS);
(gint32) fd->del_ts.secs, fd->del_ts.nsecs / 1000000, MSECS);
break;
case(TS_PREC_FIXED_USEC):
case(TS_PREC_AUTO_USEC):
display_signed_time(cinfo->col_buf[col], COL_MAX_LEN,
fd->del_ts.secs, fd->del_ts.nsecs / 1000, USECS);
(gint32) fd->del_ts.secs, fd->del_ts.nsecs / 1000, USECS);
break;
case(TS_PREC_FIXED_NSEC):
case(TS_PREC_AUTO_NSEC):
display_signed_time(cinfo->col_buf[col], COL_MAX_LEN,
fd->del_ts.secs, fd->del_ts.nsecs, NSECS);
(gint32) fd->del_ts.secs, fd->del_ts.nsecs, NSECS);
break;
default:
g_assert_not_reached();

4
epan/radius_dict.l
View File

@ -224,7 +224,7 @@ void add_vendor(const gchar* name, guint32 vendor_id) {
v->ett = -1;
g_hash_table_insert(dict->vendors_by_id,GUINT_TO_POINTER(v->code),v);
g_hash_table_insert(dict->vendors_by_name,v->name,v);
g_hash_table_insert(dict->vendors_by_name, (gpointer) v->name, v);
}
void add_attribute(const gchar* name, const gchar* code, radius_attr_dissector_t type, const gchar* vendor_name, gboolean crypt, gboolean tagged) {
@ -332,7 +332,7 @@ static gboolean destroy_attrs(gpointer k _U_, gpointer v, gpointer p _U_) {
static gboolean destroy_vendors(gpointer k _U_, gpointer v, gpointer p) {
radius_vendor_info_t* vnd = v;
g_free(vnd->name);
g_free( (gpointer) vnd->name);
g_hash_table_foreach_remove(vnd->attrs_by_id,destroy_attrs,p);
g_hash_table_destroy(vnd->attrs_by_id);
g_free(vnd);