Newlines don't belong in format strings for the "proto_tree_add"

routines.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10094 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/packet-cops.c b/packet-cops.c
index 362978b07dc06a95bf37b94a369f501779798e5c..117e822c4cf868bbe5a35f2aca23278d2983bb10 100644 (file)
--- a/packet-cops.c
+++ b/packet-cops.c
@@ -4,7 +4,7 @@
  *
  * Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi>
  *
- * $Id: packet-cops.c,v 1.42 2004/01/17 12:50:59 ulfl Exp $
+ * $Id: packet-cops.c,v 1.43 2004/02/18 10:11:51 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -614,7 +614,7 @@ static int dissect_cops_object(tvbuff_t *tvb, guint32 offset, proto_tree *tree)
   if (object_len < COPS_OBJECT_HDR_SIZE) {
     /* Bogus! */
     proto_tree_add_text(tree, tvb, offset, 2,
-                        "Bad COPS object length: %u, should be at least %u\n",
+                        "Bad COPS object length: %u, should be at least %u",
                         object_len, COPS_OBJECT_HDR_SIZE);
     return -1;
   }
@@ -666,7 +666,7 @@ static void dissect_cops_pr_objects(tvbuff_t *tvb, guint32 offset, proto_tree *t
     if (object_len < COPS_OBJECT_HDR_SIZE) {
       /* Bogus! */
       proto_tree_add_text(tree, tvb, offset, 2,
-                          "Bad COPS PR object length: %u, should be at least %u\n",
+                          "Bad COPS PR object length: %u, should be at least %u",
                           object_len, COPS_OBJECT_HDR_SIZE);
       return;
     }

diff --git a/packet-gprs-ns.c b/packet-gprs-ns.c
index 7a1a21aecf8d6a49e7449941583f6bd816281bc8..5c7b4a59deccad2c03e514e7218a629f19c9baed 100644 (file)
--- a/packet-gprs-ns.c
+++ b/packet-gprs-ns.c
@@ -3,7 +3,7 @@
  * dissection
  * Copyright 2003, Josef Korelus <jkor@quick.cz>
  *
- * $Id: packet-gprs-ns.c,v 1.7 2003/11/14 18:59:00 guy Exp $
+ * $Id: packet-gprs-ns.c,v 1.8 2004/02/18 10:11:51 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -154,7 +154,7 @@ process_tlvs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
                                if (tree) {
                                        proto_tree_add_text(tree,
                                            tvb, offset, length,
-                                           "Bad cause length %u, should be 1\n",
+                                           "Bad cause length %u, should be 1",
                                            length);
                                }
                        }
@@ -176,7 +176,7 @@ process_tlvs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
                                if (tree) {
                                        proto_tree_add_text(tree,
                                            tvb, offset, length,
-                                           "Bad NS-VCI length %u, should be 2\n",
+                                           "Bad NS-VCI length %u, should be 2",
                                            length);
                                }
                        }
@@ -210,7 +210,7 @@ process_tlvs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
                                if (tree) {
                                        proto_tree_add_text(tree,
                                            tvb, offset, length,
-                                           "Bad BVCI length %u, should be 2\n",
+                                           "Bad BVCI length %u, should be 2",
                                            length);
                                }
                        }
@@ -232,7 +232,7 @@ process_tlvs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
                                if (tree) {
                                        proto_tree_add_text(tree,
                                            tvb, offset, length,
-                                           "Bad NSEI length %u, should be 2\n",
+                                           "Bad NSEI length %u, should be 2",
                                            length);
                                }
                        }

diff --git a/packet-ismp.c b/packet-ismp.c
index 9fe6eaddcd6f813a9d6c96cb9d14f7736563c7ab..cf486807c67cf4b8e86a04bde0be705a7e7a4160 100644 (file)
--- a/packet-ismp.c
+++ b/packet-ismp.c
@@ -3,7 +3,7 @@
  * Enterasys Networks Home: http://www.enterasys.com/
  * Copyright 2003, Joshua Craig Douglas <jdouglas@enterasys.com>
  *
- * $Id: packet-ismp.c,v 1.3 2004/01/03 03:37:26 guy Exp $
+ * $Id: packet-ismp.c,v 1.4 2004/02/18 10:11:51 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -465,7 +465,7 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp
                                                case EDP_TUPLE_UNKNOWN:
                                                default:
                                                        proto_tree_add_text(edp_tuples_leaf_tree, tvb, offset, tuple_length,
-                                                               "Unknown Tuple Data %s\n", tvb_format_text(tvb, offset, tuple_length));
+                                                               "Unknown Tuple Data %s", tvb_format_text(tvb, offset, tuple_length));
                                                        break;
                                        }  
                                }

diff --git a/packet-q933.c b/packet-q933.c
index 6e9a8369ec22bdd5b754c3d778bdd33af2591ee8..c36c2f27ffa8ade4193fbd0b2ccb8adb38f0be50 100644 (file)
--- a/packet-q933.c
+++ b/packet-q933.c
@@ -2,7 +2,7 @@
  * Routines for Q.933 frame disassembly
  * Guy Harris <guy@alum.mit.edu>
  *
- * $Id: packet-q933.c,v 1.4 2003/11/03 20:57:36 guy Exp $
+ * $Id: packet-q933.c,v 1.5 2004/02/18 10:11:51 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -264,7 +264,7 @@ dissect_q933_segmented_message_ie(tvbuff_t *tvb, int offset, int len,
 {
        if (len != 2) {
                proto_tree_add_text(tree, tvb, offset, len,
-                   "Segmented message: length is %d, should be 2\n", len);
+                   "Segmented message: length is %d, should be 2", len);
                return;
        }
        if (tvb_get_guint8(tvb, offset) & 0x80) {
@@ -277,7 +277,7 @@ dissect_q933_segmented_message_ie(tvbuff_t *tvb, int offset, int len,
                    tvb_get_guint8(tvb, offset) & 0x7F);
        }
        proto_tree_add_text(tree, tvb, offset + 1, 1,
-           "Segmented message type: %u\n", tvb_get_guint8(tvb, offset + 1));
+           "Segmented message type: %u", tvb_get_guint8(tvb, offset + 1));
 }
 
 /*

diff --git a/packet-trmac.c b/packet-trmac.c
index 0d15d53edddd20e9cf142fa831bba89e6b7d137b..86e24a00f30b680bcd59b8441812abf7274342fe 100644 (file)
--- a/packet-trmac.c
+++ b/packet-trmac.c
@@ -2,7 +2,7 @@
  * Routines for Token-Ring Media Access Control
  * Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * $Id: packet-trmac.c,v 1.38 2002/08/28 21:00:36 jmayer Exp $
+ * $Id: packet-trmac.c,v 1.39 2004/02/18 10:11:52 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -293,7 +293,7 @@ dissect_trmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        mv_val = tvb_get_guint8(tvb, 3);
 
        /* Interpret the major vector */
-       mv_text = val_to_str(mv_val, major_vector_vs, "Unknown Major Vector: %d\n");
+       mv_text = val_to_str(mv_val, major_vector_vs, "Unknown Major Vector: %u");
 
        if (check_col(pinfo->cinfo, COL_INFO))
                col_add_str(pinfo->cinfo, COL_INFO, mv_text);