automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@67648 65c4cc65-6c06-0410-ace0-fbb531ad65f3

devicestate.c

@@ -198,14 +198,13 @@ static int __ast_device_state_changed_literal(char *buf)
 {
 	char *device;
 	struct state_change *change = NULL;
+	char *tmp = NULL;
 
 	device = buf;
 
-	if (!strncasecmp(device, "Zap", 3)) {
+	tmp = strrchr(device, '-');
-		char *tmp = strrchr(device, '-');
 	if (tmp)
 		*tmp = '\0';
-	}
 
 	if (change_thread != AST_PTHREADT_NULL)
 		change = calloc(1, sizeof(*change) + strlen(device));