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

Make the format argument to the "col_XXX_fstr()" routines, and the "str" 

argument to "col_append_str()", const pointers; they're not modified by
the routines in question.

svn path=/trunk/; revision=6725
This commit is contained in:
Guy Harris 2002-12-02 23:34:40 +00:00
parent cfa04730cf
commit 8414298f89
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
epan/column-utils.c
View File

@ -1,7 +1,7 @@
/* column-utils.c
* Routines for column utilities.
*
* $Id: column-utils.c,v 1.25 2002/11/11 19:23:14 guy Exp $
* $Id: column-utils.c,v 1.26 2002/12/02 23:34:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -124,7 +124,7 @@ col_set_str(column_info *cinfo, gint el, gchar* str) {
/* Adds a vararg list to a packet info string. */
void
col_add_fstr(column_info *cinfo, gint el, gchar *format, ...) {
col_add_fstr(column_info *cinfo, gint el, const gchar *format, ...) {
va_list ap;
int i;
size_t max_len;
@ -146,7 +146,7 @@ col_add_fstr(column_info *cinfo, gint el, gchar *format, ...) {
/* Appends a vararg list to a packet info string. */
void
col_append_fstr(column_info *cinfo, gint el, gchar *format, ...) {
col_append_fstr(column_info *cinfo, gint el, const gchar *format, ...) {
va_list ap;
int i;
size_t len, max_len;
@ -177,7 +177,7 @@ col_append_fstr(column_info *cinfo, gint el, gchar *format, ...) {
#define COL_BUF_MAX_LEN (((COL_MAX_INFO_LEN) > (COL_MAX_LEN)) ? \
(COL_MAX_INFO_LEN) : (COL_MAX_LEN))
void
col_prepend_fstr(column_info *cinfo, gint el, gchar *format, ...)
col_prepend_fstr(column_info *cinfo, gint el, const gchar *format, ...)
{
va_list ap;
int i;
@ -232,7 +232,7 @@ col_add_str(column_info *cinfo, gint el, const gchar* str) {
}
void
col_append_str(column_info *cinfo, gint el, gchar* str) {
col_append_str(column_info *cinfo, gint el, const gchar* str) {
int i;
size_t len, max_len;

16
epan/column-utils.h
View File

@ -1,7 +1,7 @@
/* column-utils.h
* Definitions for column utility structures and routines
*
* $Id: column-utils.h,v 1.8 2002/11/11 19:23:14 guy Exp $
* $Id: column-utils.h,v 1.9 2002/12/02 23:34:38 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -45,19 +45,19 @@ extern gint check_col(column_info *, gint);
extern void col_clear(column_info *, gint);
extern void col_set_str(column_info *, gint, gchar *);
#if __GNUC__ >= 2
extern void col_add_fstr(column_info *, gint, gchar *, ...)
extern void col_add_fstr(column_info *, gint, const gchar *, ...)
__attribute__((format (printf, 3, 4)));
extern void col_append_fstr(column_info *, gint, gchar *, ...)
extern void col_append_fstr(column_info *, gint, const gchar *, ...)
__attribute__((format (printf, 3, 4)));
extern void col_prepend_fstr(column_info *, gint, gchar *, ...)
extern void col_prepend_fstr(column_info *, gint, const gchar *, ...)
__attribute__((format (printf, 3, 4)));
#else
extern void col_add_fstr(column_info *, gint, gchar *, ...);
extern void col_append_fstr(column_info *, gint, gchar *, ...);
extern void col_prepend_fstr(column_info *, gint, gchar *, ...);
extern void col_add_fstr(column_info *, gint, const gchar *, ...);
extern void col_append_fstr(column_info *, gint, const gchar *, ...);
extern void col_prepend_fstr(column_info *, gint, const gchar *, ...);
#endif
extern void col_add_str(column_info *, gint, const gchar *);
extern void col_append_str(column_info *, gint, gchar *);
extern void col_append_str(column_info *, gint, const gchar *);
extern void col_set_cls_time(frame_data *, column_info *, int);
extern void fill_in_columns(packet_info *);

10
plugins/plugin_table.h
View File

@ -1,7 +1,7 @@
/* plugin_table.h
* Table of exported addresses for Ethereal plugins.
*
* $Id: plugin_table.h,v 1.55 2002/11/28 22:13:52 guy Exp $
* $Id: plugin_table.h,v 1.56 2002/12/02 23:34:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
@ -33,11 +33,11 @@
/* Typedefs to make our plugin_address_table_t struct look prettier */
typedef gint (*addr_check_col)(column_info*, gint);
typedef void (*addr_col_clear)(column_info*, gint);
typedef void (*addr_col_add_fstr)(column_info*, gint, gchar*, ...);
typedef void (*addr_col_append_fstr)(column_info*, gint, gchar*, ...);
typedef void (*addr_col_prepend_fstr)(column_info*, gint, gchar*, ...);
typedef void (*addr_col_add_fstr)(column_info*, gint, const gchar*, ...);
typedef void (*addr_col_append_fstr)(column_info*, gint, const gchar*, ...);
typedef void (*addr_col_prepend_fstr)(column_info*, gint, const gchar*, ...);
typedef void (*addr_col_add_str)(column_info*, gint, const gchar*);
typedef void (*addr_col_append_str)(column_info*, gint, gchar*);
typedef void (*addr_col_append_str)(column_info*, gint, const gchar*);
typedef void (*addr_col_set_str)(column_info*, gint, gchar*);
typedef void (*addr_register_init_routine)(void (*func)(void));