diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-12-26 05:57:06 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-12-26 05:57:06 +0000 |
| commit | 8ed7a73e22c049a2e013bb436e599bff41fc5b9b (patch) | |
| tree | ad4a4cc6fb4ff4d3e3ffe3a3f8e3d056e441ae46 /epan/prefs-int.h | |
| parent | 8ede6b7dc09aa636f87147ab432a137c209e8aca (diff) | |
Fix a bunch of warnings.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().
Change some data types to avoid those implicit conversion warnings.
When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.
Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers. Cast
away those warnings in some cases where an API we don't control forces
us to do so.
Enable a bunch of additional warnings by default. Note why at least
some of the other warnings aren't enabled.
randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.
If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.
svn path=/trunk/; revision=46748
Diffstat (limited to 'epan/prefs-int.h')
| -rw-r--r-- | epan/prefs-int.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/prefs-int.h b/epan/prefs-int.h index 3694332e40..ec91db175f 100644 --- a/epan/prefs-int.h +++ b/epan/prefs-int.h @@ -67,7 +67,7 @@ WS_VAR_IMPORT module_t *protocols_module; typedef void (*pref_custom_free_cb) (pref_t* pref); typedef void (*pref_custom_reset_cb) (pref_t* pref); -typedef prefs_set_pref_e (*pref_custom_set_cb) (pref_t* pref, gchar* value, gboolean* changed); +typedef prefs_set_pref_e (*pref_custom_set_cb) (pref_t* pref, const gchar* value, gboolean* changed); typedef void (*pref_custom_write_cb) (pref_t* pref, write_pref_arg_t* arg); /** Structure to hold callbacks for PREF_CUSTOM type */ @@ -155,7 +155,7 @@ struct preference { * @return an indication of whether it succeeded or failed * in some fashion. */ -typedef prefs_set_pref_e (*pref_set_pair_cb) (gchar *key, gchar *value, void *private_data, gboolean return_range_errors); +typedef prefs_set_pref_e (*pref_set_pair_cb) (gchar *key, const gchar *value, void *private_data, gboolean return_range_errors); /** read the preferences file (or similiar) and call the callback * function to set each key/value pair found |