Constify a bunch of stuff, to squelch -Wwrite-strings warnings.

epan/dissectors/packet-ncp2222.inc is a bit hard to fix, so we're not
ready to enable that warning by default yet.

Throw in some casts to handle GLib routines that take arbitrary
non-const pointers (they can later return the pointers, and some
callers might want to modify or free up those pointers in cases where
they're known to be writable or allocated).

Use ep_tvb_memdup() rather than a combination of ep_alloc() and
tvb_memcpy().

Clean up some indentation.

svn path=/trunk/; revision=25601

1 files changed, 90 insertions, 90 deletions

diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c
index 51e6e2d11c..e24e318c1f 100644
--- a/epan/dissectors/packet-fix.c
+++ b/epan/dissectors/packet-fix.c
@@ -743,96 +743,96 @@ static void dissect_fix_init(void) {
 
     g_datalist_init(&msg_types);
 
-    g_datalist_set_data(&msg_types, "0", "Heartbeat");
-    g_datalist_set_data(&msg_types, "1", "Test Request");
-    g_datalist_set_data(&msg_types, "2", "Resend Request");
-    g_datalist_set_data(&msg_types, "3", "Reject");
-    g_datalist_set_data(&msg_types, "4", "Sequence Reset");
-    g_datalist_set_data(&msg_types, "5", "Logout");
-    g_datalist_set_data(&msg_types, "6", "Indication of Interest");
-    g_datalist_set_data(&msg_types, "7", "Advertisement");
-    g_datalist_set_data(&msg_types, "8", "Execution Report");
-    g_datalist_set_data(&msg_types, "9", "Order Cancel Reject");
-    g_datalist_set_data(&msg_types, "A", "Logon");
-    g_datalist_set_data(&msg_types, "B", "News");
-    g_datalist_set_data(&msg_types, "C", "Email");
-    g_datalist_set_data(&msg_types, "D", "Order - Single");
-    g_datalist_set_data(&msg_types, "E", "Order - List");
-    g_datalist_set_data(&msg_types, "F", "Order Cancel Request");
-    g_datalist_set_data(&msg_types, "G", "Order Cancel - Replace Request");
-    g_datalist_set_data(&msg_types, "H", "Order Status Request");
-    g_datalist_set_data(&msg_types, "J", "Allocation");
-    g_datalist_set_data(&msg_types, "K", "List Cancel Request");
-    g_datalist_set_data(&msg_types, "L", "List Execute");
-    g_datalist_set_data(&msg_types, "M", "List Status Request");
-    g_datalist_set_data(&msg_types, "N", "List Status");
-    g_datalist_set_data(&msg_types, "P", "Allocation ACK");
-    g_datalist_set_data(&msg_types, "Q", "Don't Know Trade (DK)");
-    g_datalist_set_data(&msg_types, "R", "Quote Request");
-    g_datalist_set_data(&msg_types, "S", "Quote");
-    g_datalist_set_data(&msg_types, "T", "Settlement Instructions");
-    g_datalist_set_data(&msg_types, "V", "Market Data Request");
-    g_datalist_set_data(&msg_types, "W", "Market Data-Snapshot - Full Refresh");
-    g_datalist_set_data(&msg_types, "X", "Market Data-Incremental Refresh");
-    g_datalist_set_data(&msg_types, "Y", "Market Data Request Reject");
-    g_datalist_set_data(&msg_types, "Z", "Quote Cancel");
-    g_datalist_set_data(&msg_types, "a", "Quote Status Request");
-    g_datalist_set_data(&msg_types, "b", "Mass Quote Acknowledgement");
-    g_datalist_set_data(&msg_types, "c", "Security Definition Request");
-    g_datalist_set_data(&msg_types, "d", "Security Definition");
-    g_datalist_set_data(&msg_types, "e", "Security Status Request");
-    g_datalist_set_data(&msg_types, "f", "Security Status");
-    g_datalist_set_data(&msg_types, "g", "Trading Session Status Request");
-    g_datalist_set_data(&msg_types, "h", "Trading Session Status");
-    g_datalist_set_data(&msg_types, "i", "Mass Quote");
-    g_datalist_set_data(&msg_types, "j", "Business Message Reject");
-    g_datalist_set_data(&msg_types, "k", "Bid Request ");
-    g_datalist_set_data(&msg_types, "l", "Bid Response");
-    g_datalist_set_data(&msg_types, "m", "List Strike Price");
-    g_datalist_set_data(&msg_types, "n", "XML message");
-    g_datalist_set_data(&msg_types, "o", "Registration Instructions");
-    g_datalist_set_data(&msg_types, "p", "Registration Instructions Response");
-    g_datalist_set_data(&msg_types, "q", "Order Mass Cancel Request");
-    g_datalist_set_data(&msg_types, "r", "Order Mass Cancel Report");
-    g_datalist_set_data(&msg_types, "s", "New Order - Cross");
-    g_datalist_set_data(&msg_types, "t", "Cross Order Cancel - Replace Request");
-    g_datalist_set_data(&msg_types, "u", "Cross Order Cancel Request");
-    g_datalist_set_data(&msg_types, "v", "Security Type Request");
-    g_datalist_set_data(&msg_types, "w", "Security Types");
-    g_datalist_set_data(&msg_types, "x", "Security List Request");
-    g_datalist_set_data(&msg_types, "y", "Security List");
-    g_datalist_set_data(&msg_types, "z", "Derivative Security List Request");
-    g_datalist_set_data(&msg_types, "AA", "Derivative Security List");
-    g_datalist_set_data(&msg_types, "AB", "New Order - Multileg");
-    g_datalist_set_data(&msg_types, "AC", "Multileg Order Cancel - Replace");
-    g_datalist_set_data(&msg_types, "AD", "Trade Capture Report Request");
-    g_datalist_set_data(&msg_types, "AE", "Trade Capture Report");
-    g_datalist_set_data(&msg_types, "AF", "Order Mass Status Request");
-    g_datalist_set_data(&msg_types, "AG", "Quote Request Reject");
-    g_datalist_set_data(&msg_types, "AH", "RFQ Request");
-    g_datalist_set_data(&msg_types, "AI", "Quote Status Report");
-    g_datalist_set_data(&msg_types, "AJ", "Quote Response");
-    g_datalist_set_data(&msg_types, "AK", "Confirmation");
-    g_datalist_set_data(&msg_types, "AL", "Position Maintenance Request");
-    g_datalist_set_data(&msg_types, "AM", "Position Maintenance Report");
-    g_datalist_set_data(&msg_types, "AN", "Request For Positions");
-    g_datalist_set_data(&msg_types, "AO", "Request For Positions Ack");
-    g_datalist_set_data(&msg_types, "AP", "Position Report");
-    g_datalist_set_data(&msg_types, "AQ", "Trade Capture Report Request Ack");
-    g_datalist_set_data(&msg_types, "AR", "Trade Capture Report Ack");
-    g_datalist_set_data(&msg_types, "AS", "Allocation Report");
-    g_datalist_set_data(&msg_types, "AT", "Allocation Report Ack");
-    g_datalist_set_data(&msg_types, "AU", "Confirmation Ack");
-    g_datalist_set_data(&msg_types, "AV", "Settlement Instruction Request");
-    g_datalist_set_data(&msg_types, "AW", "Assignment Report");
-    g_datalist_set_data(&msg_types, "AX", "Collateral Request");
-    g_datalist_set_data(&msg_types, "AY", "Collateral Assignment");
-    g_datalist_set_data(&msg_types, "AZ", "Collateral Response");
-    g_datalist_set_data(&msg_types, "BA", "Collateral Report");
-    g_datalist_set_data(&msg_types, "BB", "Collateral Inquiry");
-    g_datalist_set_data(&msg_types, "BE", "User Request");
-    g_datalist_set_data(&msg_types, "BF", "User Response");
-    g_datalist_set_data(&msg_types, "BG", "Collateral Inquiry Ack");
+    g_datalist_set_data(&msg_types, "0", (gchar *)"Heartbeat");
+    g_datalist_set_data(&msg_types, "1", (gchar *)"Test Request");
+    g_datalist_set_data(&msg_types, "2", (gchar *)"Resend Request");
+    g_datalist_set_data(&msg_types, "3", (gchar *)"Reject");
+    g_datalist_set_data(&msg_types, "4", (gchar *)"Sequence Reset");
+    g_datalist_set_data(&msg_types, "5", (gchar *)"Logout");
+    g_datalist_set_data(&msg_types, "6", (gchar *)"Indication of Interest");
+    g_datalist_set_data(&msg_types, "7", (gchar *)"Advertisement");
+    g_datalist_set_data(&msg_types, "8", (gchar *)"Execution Report");
+    g_datalist_set_data(&msg_types, "9", (gchar *)"Order Cancel Reject");
+    g_datalist_set_data(&msg_types, "A", (gchar *)"Logon");
+    g_datalist_set_data(&msg_types, "B", (gchar *)"News");
+    g_datalist_set_data(&msg_types, "C", (gchar *)"Email");
+    g_datalist_set_data(&msg_types, "D", (gchar *)"Order - Single");
+    g_datalist_set_data(&msg_types, "E", (gchar *)"Order - List");
+    g_datalist_set_data(&msg_types, "F", (gchar *)"Order Cancel Request");
+    g_datalist_set_data(&msg_types, "G", (gchar *)"Order Cancel - Replace Request");
+    g_datalist_set_data(&msg_types, "H", (gchar *)"Order Status Request");
+    g_datalist_set_data(&msg_types, "J", (gchar *)"Allocation");
+    g_datalist_set_data(&msg_types, "K", (gchar *)"List Cancel Request");
+    g_datalist_set_data(&msg_types, "L", (gchar *)"List Execute");
+    g_datalist_set_data(&msg_types, "M", (gchar *)"List Status Request");
+    g_datalist_set_data(&msg_types, "N", (gchar *)"List Status");
+    g_datalist_set_data(&msg_types, "P", (gchar *)"Allocation ACK");
+    g_datalist_set_data(&msg_types, "Q", (gchar *)"Don't Know Trade (DK)");
+    g_datalist_set_data(&msg_types, "R", (gchar *)"Quote Request");
+    g_datalist_set_data(&msg_types, "S", (gchar *)"Quote");
+    g_datalist_set_data(&msg_types, "T", (gchar *)"Settlement Instructions");
+    g_datalist_set_data(&msg_types, "V", (gchar *)"Market Data Request");
+    g_datalist_set_data(&msg_types, "W", (gchar *)"Market Data-Snapshot - Full Refresh");
+    g_datalist_set_data(&msg_types, "X", (gchar *)"Market Data-Incremental Refresh");
+    g_datalist_set_data(&msg_types, "Y", (gchar *)"Market Data Request Reject");
+    g_datalist_set_data(&msg_types, "Z", (gchar *)"Quote Cancel");
+    g_datalist_set_data(&msg_types, "a", (gchar *)"Quote Status Request");
+    g_datalist_set_data(&msg_types, "b", (gchar *)"Mass Quote Acknowledgement");
+    g_datalist_set_data(&msg_types, "c", (gchar *)"Security Definition Request");
+    g_datalist_set_data(&msg_types, "d", (gchar *)"Security Definition");
+    g_datalist_set_data(&msg_types, "e", (gchar *)"Security Status Request");
+    g_datalist_set_data(&msg_types, "f", (gchar *)"Security Status");
+    g_datalist_set_data(&msg_types, "g", (gchar *)"Trading Session Status Request");
+    g_datalist_set_data(&msg_types, "h", (gchar *)"Trading Session Status");
+    g_datalist_set_data(&msg_types, "i", (gchar *)"Mass Quote");
+    g_datalist_set_data(&msg_types, "j", (gchar *)"Business Message Reject");
+    g_datalist_set_data(&msg_types, "k", (gchar *)"Bid Request ");
+    g_datalist_set_data(&msg_types, "l", (gchar *)"Bid Response");
+    g_datalist_set_data(&msg_types, "m", (gchar *)"List Strike Price");
+    g_datalist_set_data(&msg_types, "n", (gchar *)"XML message");
+    g_datalist_set_data(&msg_types, "o", (gchar *)"Registration Instructions");
+    g_datalist_set_data(&msg_types, "p", (gchar *)"Registration Instructions Response");
+    g_datalist_set_data(&msg_types, "q", (gchar *)"Order Mass Cancel Request");
+    g_datalist_set_data(&msg_types, "r", (gchar *)"Order Mass Cancel Report");
+    g_datalist_set_data(&msg_types, "s", (gchar *)"New Order - Cross");
+    g_datalist_set_data(&msg_types, "t", (gchar *)"Cross Order Cancel - Replace Request");
+    g_datalist_set_data(&msg_types, "u", (gchar *)"Cross Order Cancel Request");
+    g_datalist_set_data(&msg_types, "v", (gchar *)"Security Type Request");
+    g_datalist_set_data(&msg_types, "w", (gchar *)"Security Types");
+    g_datalist_set_data(&msg_types, "x", (gchar *)"Security List Request");
+    g_datalist_set_data(&msg_types, "y", (gchar *)"Security List");
+    g_datalist_set_data(&msg_types, "z", (gchar *)"Derivative Security List Request");
+    g_datalist_set_data(&msg_types, "AA", (gchar *)"Derivative Security List");
+    g_datalist_set_data(&msg_types, "AB", (gchar *)"New Order - Multileg");
+    g_datalist_set_data(&msg_types, "AC", (gchar *)"Multileg Order Cancel - Replace");
+    g_datalist_set_data(&msg_types, "AD", (gchar *)"Trade Capture Report Request");
+    g_datalist_set_data(&msg_types, "AE", (gchar *)"Trade Capture Report");
+    g_datalist_set_data(&msg_types, "AF", (gchar *)"Order Mass Status Request");
+    g_datalist_set_data(&msg_types, "AG", (gchar *)"Quote Request Reject");
+    g_datalist_set_data(&msg_types, "AH", (gchar *)"RFQ Request");
+    g_datalist_set_data(&msg_types, "AI", (gchar *)"Quote Status Report");
+    g_datalist_set_data(&msg_types, "AJ", (gchar *)"Quote Response");
+    g_datalist_set_data(&msg_types, "AK", (gchar *)"Confirmation");
+    g_datalist_set_data(&msg_types, "AL", (gchar *)"Position Maintenance Request");
+    g_datalist_set_data(&msg_types, "AM", (gchar *)"Position Maintenance Report");
+    g_datalist_set_data(&msg_types, "AN", (gchar *)"Request For Positions");
+    g_datalist_set_data(&msg_types, "AO", (gchar *)"Request For Positions Ack");
+    g_datalist_set_data(&msg_types, "AP", (gchar *)"Position Report");
+    g_datalist_set_data(&msg_types, "AQ", (gchar *)"Trade Capture Report Request Ack");
+    g_datalist_set_data(&msg_types, "AR", (gchar *)"Trade Capture Report Ack");
+    g_datalist_set_data(&msg_types, "AS", (gchar *)"Allocation Report");
+    g_datalist_set_data(&msg_types, "AT", (gchar *)"Allocation Report Ack");
+    g_datalist_set_data(&msg_types, "AU", (gchar *)"Confirmation Ack");
+    g_datalist_set_data(&msg_types, "AV", (gchar *)"Settlement Instruction Request");
+    g_datalist_set_data(&msg_types, "AW", (gchar *)"Assignment Report");
+    g_datalist_set_data(&msg_types, "AX", (gchar *)"Collateral Request");
+    g_datalist_set_data(&msg_types, "AY", (gchar *)"Collateral Assignment");
+    g_datalist_set_data(&msg_types, "AZ", (gchar *)"Collateral Response");
+    g_datalist_set_data(&msg_types, "BA", (gchar *)"Collateral Report");
+    g_datalist_set_data(&msg_types, "BB", (gchar *)"Collateral Inquiry");
+    g_datalist_set_data(&msg_types, "BE", (gchar *)"User Request");
+    g_datalist_set_data(&msg_types, "BF", (gchar *)"User Response");
+    g_datalist_set_data(&msg_types, "BG", (gchar *)"Collateral Inquiry Ack");
     g_datalist_set_data(&msg_types, "BH", (gpointer)(void *)"Confirmation Request");
 
 }