diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2005-07-22 17:57:40 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2005-07-22 17:57:40 +0000 |
| commit | e1c6d9ac3d081221af8b16b56561b7b21ff3de35 (patch) | |
| tree | a1c249ceddf759c2b3a4f22a37d0ed612b198e44 /wiretap | |
| parent | 5731769818a12e07edd9599d8cb50e5bcfdd5d8b (diff) | |
Fix some warnings (and one of my previous 'fixes')
svn path=/trunk/; revision=14997
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/ascend-grammar.y | 6 | ||||
| -rw-r--r-- | wiretap/ascend-int.h | 2 | ||||
| -rw-r--r-- | wiretap/wtap.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/wiretap/ascend-grammar.y b/wiretap/ascend-grammar.y index 74456e31d8..398d8c5852 100644 --- a/wiretap/ascend-grammar.y +++ b/wiretap/ascend-grammar.y @@ -145,9 +145,9 @@ XMIT-Max7:20: (task "_brouterControlTask" at 0xb094ac20, time: 1481.51) 20 octet #define NO_USER "<none>" int yyparse(void); -void yyerror(char *); +void yyerror(const char *); -gchar *ascend_parse_error; +const gchar *ascend_parse_error; static unsigned int bcur; static guint32 start_time, secs, usecs, caplen, wirelen; @@ -509,7 +509,7 @@ parse_ascend(FILE_T fh, guint8 *pd, struct ascend_phdr *phdr, } void -yyerror (char *s) +yyerror (const char *s) { ascend_parse_error = s; } diff --git a/wiretap/ascend-int.h b/wiretap/ascend-int.h index f46825db7d..62c260ab54 100644 --- a/wiretap/ascend-int.h +++ b/wiretap/ascend-int.h @@ -36,7 +36,7 @@ typedef struct { extern int at_eof; -extern gchar *ascend_parse_error; +extern const gchar *ascend_parse_error; /* * Pointer to the pseudo-header for the current packet. diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 3c0c28b6e7..b18b2f74d7 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -465,8 +465,8 @@ typedef union { struct k12_phdr { guint32 input; - gchar* input_name; - gchar* stack_file; + const gchar* input_name; + const gchar* stack_file; guint32 input_type; k12_input_info_t input_info; void* stuff; |