Index: packet-ansi_a.c
===================================================================
RCS file: /cvsroot/ethereal/packet-ansi_a.c,v
retrieving revision 1.1
diff -u -r1.1 packet-ansi_a.c
--- packet-ansi_a.c	22 Oct 2003 20:59:01 -0000	1.1
+++ packet-ansi_a.c	28 Oct 2003 16:30:37 -0000
@@ -434,18 +434,16 @@
 	/*
 	 * unpack first value in byte
 	 */
-	i = *in;
-	i &= 0x0F;
-	*out++ = dgt->out[i];
+	i = *in++;
+	*out++ = dgt->out[i & 0x0f];
 	cnt++;
 
 	/*
 	 * unpack second value in byte
 	 */
-	i = *in++;
 	i >>= 4;
 
-	if (i == 0xff)	/* odd number bytes - hit filler */
+	if (i == 0x0f)	/* odd number bytes - hit filler */
 	    break;
 
 	*out++ = dgt->out[i];
@@ -606,7 +604,7 @@
     case 0: str = "No Alert"; break;
     case 1: str = "Speech"; break;
     case 2: str = "Data"; data = TRUE; break;
-    case 3: str = "Signaling";
+    case 3: str = "Signaling"; break;
     default:
 	str = "Unknown";
 	break;
@@ -2007,7 +2005,6 @@
     guint32	curr_offset;
     gchar	*str = NULL;
 
-    add_string = add_string;
     curr_offset = offset;
 
     oct = tvb_get_guint8(tvb, curr_offset);