SKINNY: Fix some warning

Fix: cog [[[END]]] in packet-skinny.h.in
Fix: error: expression which evaluates to zero treated as a null pointer constant of type 'const gchar *' (aka 'const char *') [-Werror,-Wnon-literal-null-conversion] (Reported by Alexis La Goutte and found by Clang 3.6)

Change-Id: Ic354f349eef8a12a7e18e841b517ea4f72ba86f2
Reviewed-on: https://code.wireshark.org/review/3842
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

4 files changed, 25 insertions, 7 deletions

diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c
index 6ccb829dd6..5e967473c0 100644
--- a/epan/dissectors/packet-skinny.c
+++ b/epan/dissectors/packet-skinny.c
@@ -2288,7 +2288,7 @@ dissect_skinny_displayLabel(ptvcursor_t *cursor, int hfindex, guint32 length, gu
   wmem_new = wmem_strbuf_sized_new(wmem_packet_scope(), strlen(disp_string), maxlength);
 
   while (*disp_string) {
-    replacestr = '\0';
+    replacestr = NULL;
     if (strlen(disp_string) > x+1) {
       if (*disp_string == '\36') {
         replacestr = try_val_to_str_ext(disp_string[x + 1], &DisplayLabels_36_ext);
diff --git a/epan/dissectors/packet-skinny.c.in b/epan/dissectors/packet-skinny.c.in
index 934d276ae2..e3f69ad1da 100644
--- a/epan/dissectors/packet-skinny.c.in
+++ b/epan/dissectors/packet-skinny.c.in
@@ -294,7 +294,7 @@ dissect_skinny_displayLabel(ptvcursor_t *cursor, int hfindex, guint32 length, gu
   wmem_new = wmem_strbuf_sized_new(wmem_packet_scope(), strlen(disp_string), maxlength);
 
   while (*disp_string) {
-    replacestr = '\0';
+    replacestr = NULL;
     if (strlen(disp_string) > x+1) {
       if (*disp_string == '\36') {
         replacestr = try_val_to_str_ext(disp_string[x + 1], &DisplayLabels_36_ext);
diff --git a/epan/dissectors/packet-skinny.h b/epan/dissectors/packet-skinny.h
index aa75633ab6..89c6420c95 100644
--- a/epan/dissectors/packet-skinny.h
+++ b/epan/dissectors/packet-skinny.h
@@ -1,9 +1,21 @@
+/* Do not modify this file. Changes will be overwritten */
+/* Generated Automatically                              */
+/* packet-skinny.h                                      */
+
 /* packet-skinny.h
- * Routines for skinny packet disassembly
+ * Dissector for the Skinny Client Control Protocol
+ *   (The "D-Channel"-Protocol for Cisco Systems' IP-Phones)
  *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
+ * Author: Diederik de Groot <ddegroot@user.sf.net>, Copyright 2014
+ * Rewritten to support newer skinny protocolversions (V0-V22)
+ * Based on previous versions/contributions:
+ *  - Joerg Mayer <jmayer@loplof.de>, Copyright 2001
+ *  - Paul E. Erkkila (pee@erkkila.org) - fleshed out the decode
+ *    skeleton to report values for most message/message fields.
+ *    Much help from Guy Harris on figuring out the wireshark api.
+ *  - packet-aim.c by Ralf Hoelzer <ralf@well.com>, Copyright 2000
+ *  - Wireshark - Network traffic analyzer,
+ *    By Gerald Combs <gerald@wireshark.org>, Copyright 1998
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -20,6 +32,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/*
+ * Generated Automatically Using (from wireshark base directory):
+ *   cog.py -D xmlfile=tools/SkinnyProtocolOptimized.xml -d -c -o epan/dissectors/packet-skinny.c epan/dissectors/packet-skinny.c.in
+ */
 
 /* Container for tapping relevant data */
 typedef struct _skinny_info_t
diff --git a/epan/dissectors/packet-skinny.h.in b/epan/dissectors/packet-skinny.h.in
index ada21e7543..8211257c28 100644
--- a/epan/dissectors/packet-skinny.h.in
+++ b/epan/dissectors/packet-skinny.h.in
@@ -14,7 +14,7 @@
  *    skeleton to report values for most message/message fields.
  *    Much help from Guy Harris on figuring out the wireshark api.
  *  - packet-aim.c by Ralf Hoelzer <ralf@well.com>, Copyright 2000
- *  - Wireshark - Network traffic analyzer, 
+ *  - Wireshark - Network traffic analyzer,
  *    By Gerald Combs <gerald@wireshark.org>, Copyright 1998
  *
  * This program is free software; you can redistribute it and/or
@@ -48,6 +48,8 @@ cog.out(' *   cog.py -D xmlfile=tools/SkinnyProtocolOptimized.xml -d -c -o epan/
 cog.out(' */\n')
 ]]]*/
 
+/*[[[end]]]*/
+
 /* Container for tapping relevant data */
 typedef struct _skinny_info_t
 {