aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Mathieson <martin.mathieson@keysight.com>2021-01-27 10:12:53 +0000
committerAndersBroman <a.broman58@gmail.com>2021-01-27 20:16:21 +0000
commitefcaa68807151b46e4352bb7dbdd4134057237a1 (patch)
treeb73a9f51684f11f97e513f6cb2e74ba98ced130e
parentbe0171019c8ab25030c58fce07c8387008b31b93 (diff)
More checking of non-static symbols.
-rw-r--r--epan/dissectors/packet-wsp.c2
-rw-r--r--epan/dissectors/packet-x25.c2
-rw-r--r--epan/dissectors/x11-extension-errors.h26
-rw-r--r--epan/dissectors/x11-extension-implementation.h18
4 files changed, 24 insertions, 24 deletions
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index 608b501fb1..9d520e0d6c 100644
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -3436,7 +3436,7 @@ static const value_string parameter_type_vals[] = {
{ 0x00, NULL }
};
-value_string_ext parameter_type_vals_ext = VALUE_STRING_EXT_INIT(parameter_type_vals);
+static value_string_ext parameter_type_vals_ext = VALUE_STRING_EXT_INIT(parameter_type_vals);
/* Parameter = Untyped-parameter | Typed-parameter
* Untyped-parameter = Token-text ( Integer-value | Text-value )
diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c
index f27ea1fd89..99a22fc1d6 100644
--- a/epan/dissectors/packet-x25.c
+++ b/epan/dissectors/packet-x25.c
@@ -382,7 +382,7 @@ static const value_string x25_clear_diag_vals[] = {
{ 0, NULL}
};
-value_string_ext x25_clear_diag_vals_ext = VALUE_STRING_EXT_INIT(x25_clear_diag_vals);
+static value_string_ext x25_clear_diag_vals_ext = VALUE_STRING_EXT_INIT(x25_clear_diag_vals);
static const value_string x25_registration_code_vals[] = {
{ 0x03, "Invalid facility request" },
diff --git a/epan/dissectors/x11-extension-errors.h b/epan/dissectors/x11-extension-errors.h
index 7703a1b8cf..a3c3f39078 100644
--- a/epan/dissectors/x11-extension-errors.h
+++ b/epan/dissectors/x11-extension-errors.h
@@ -19,7 +19,7 @@ const char *composite_errors[] = {
NULL
};
-const char *damage_errors[] = {
+static const char *damage_errors[] = {
"damage-BadDamage",
NULL
};
@@ -40,7 +40,7 @@ const char *ge_errors[] = {
NULL
};
-const char *glx_errors[] = {
+static const char *glx_errors[] = {
"glx-BadContext",
"glx-BadContextState",
"glx-BadDrawable",
@@ -62,7 +62,7 @@ const char *present_errors[] = {
NULL
};
-const char *randr_errors[] = {
+static const char *randr_errors[] = {
"randr-BadOutput",
"randr-BadCrtc",
"randr-BadMode",
@@ -70,12 +70,12 @@ const char *randr_errors[] = {
NULL
};
-const char *record_errors[] = {
+static const char *record_errors[] = {
"record-BadContext",
NULL
};
-const char *render_errors[] = {
+static const char *render_errors[] = {
"render-PictFormat",
"render-Picture",
"render-PictOp",
@@ -96,12 +96,12 @@ const char *shape_errors[] = {
NULL
};
-const char *shm_errors[] = {
+static const char *shm_errors[] = {
"shm-BadSeg",
NULL
};
-const char *sync_errors[] = {
+static const char *sync_errors[] = {
"sync-Counter",
"sync-Alarm",
NULL
@@ -119,7 +119,7 @@ const char *xf86dri_errors[] = {
NULL
};
-const char *xf86vidmode_errors[] = {
+static const char *xf86vidmode_errors[] = {
"xf86vidmode-BadClock",
"xf86vidmode-BadHTimings",
"xf86vidmode-BadVTimings",
@@ -130,7 +130,7 @@ const char *xf86vidmode_errors[] = {
NULL
};
-const char *xfixes_errors[] = {
+static const char *xfixes_errors[] = {
"xfixes-BadRegion",
NULL
};
@@ -139,7 +139,7 @@ const char *xinerama_errors[] = {
NULL
};
-const char *xinput_errors[] = {
+static const char *xinput_errors[] = {
"xinput-Device",
"xinput-Event",
"xinput-Mode",
@@ -148,12 +148,12 @@ const char *xinput_errors[] = {
NULL
};
-const char *xkb_errors[] = {
+static const char *xkb_errors[] = {
"xkb-Keyboard",
NULL
};
-const char *xprint_errors[] = {
+static const char *xprint_errors[] = {
"xprint-BadContext",
"xprint-BadSequence",
NULL
@@ -167,7 +167,7 @@ const char *xtest_errors[] = {
NULL
};
-const char *xv_errors[] = {
+static const char *xv_errors[] = {
"xv-BadPort",
"xv-BadEncoding",
"xv-BadControl",
diff --git a/epan/dissectors/x11-extension-implementation.h b/epan/dissectors/x11-extension-implementation.h
index fc00d60907..c87cfedf27 100644
--- a/epan/dissectors/x11-extension-implementation.h
+++ b/epan/dissectors/x11-extension-implementation.h
@@ -6248,7 +6248,7 @@ static const value_string dri2_extension_minor[] = {
{ 13, "GetParam" },
{ 0, NULL }
};
-const x11_event_info dri2_events[] = {
+static const x11_event_info dri2_events[] = {
{ "dri2-InvalidateBuffers", dri2InvalidateBuffers },
{ NULL, NULL }
};
@@ -9557,7 +9557,7 @@ static const value_string glx_extension_minor[] = {
{ 166, "GetQueryObjectuivARB" },
{ 0, NULL }
};
-const x11_event_info glx_events[] = {
+static const x11_event_info glx_events[] = {
{ "glx-BufferSwapComplete", glxBufferSwapComplete },
{ NULL, NULL }
};
@@ -12087,7 +12087,7 @@ static const value_string randr_extension_minor[] = {
{ 46, "FreeLease" },
{ 0, NULL }
};
-const x11_event_info randr_events[] = {
+static const x11_event_info randr_events[] = {
{ "randr-Notify", randrNotify },
{ NULL, NULL }
};
@@ -14961,7 +14961,7 @@ static const value_string sync_extension_minor[] = {
{ 19, "AwaitFence" },
{ 0, NULL }
};
-const x11_event_info sync_events[] = {
+static const x11_event_info sync_events[] = {
{ "sync-AlarmNotify", syncAlarmNotify },
{ NULL, NULL }
};
@@ -17289,7 +17289,7 @@ static const value_string xfixes_extension_minor[] = {
{ 32, "DeletePointerBarrier" },
{ 0, NULL }
};
-const x11_event_info xfixes_events[] = {
+static const x11_event_info xfixes_events[] = {
{ "xfixes-CursorNotify", xfixesCursorNotify },
{ NULL, NULL }
};
@@ -20825,7 +20825,7 @@ static const value_string xinput_extension_minor[] = {
{ 61, "XIBarrierReleasePointer" },
{ 0, NULL }
};
-const x11_event_info xinput_events[] = {
+static const x11_event_info xinput_events[] = {
{ "xinput-DeviceKeyPress", xinputDeviceKeyPress },
{ "xinput-DeviceFocusIn", xinputDeviceFocusIn },
{ "xinput-DeviceStateNotify", xinputDeviceStateNotify },
@@ -26872,7 +26872,7 @@ static const value_string xkb_extension_minor[] = {
{ 101, "SetDebuggingFlags" },
{ 0, NULL }
};
-const x11_event_info xkb_events[] = {
+static const x11_event_info xkb_events[] = {
{ "xkb-MapNotify", xkbMapNotify },
{ "xkb-StateNotify", xkbStateNotify },
{ "xkb-ControlsNotify", xkbControlsNotify },
@@ -27547,7 +27547,7 @@ static const value_string xprint_extension_minor[] = {
{ 24, "PrintGetImageResolution" },
{ 0, NULL }
};
-const x11_event_info xprint_events[] = {
+static const x11_event_info xprint_events[] = {
{ "xprint-AttributNotify", xprintAttributNotify },
{ NULL, NULL }
};
@@ -29266,7 +29266,7 @@ static const value_string xv_extension_minor[] = {
{ 19, "ShmPutImage" },
{ 0, NULL }
};
-const x11_event_info xv_events[] = {
+static const x11_event_info xv_events[] = {
{ "xv-PortNotify", xvPortNotify },
{ NULL, NULL }
};