head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.54
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.52
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.50
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.48
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.46
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.44
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.42
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.40
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.38
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.36
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.34
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.32
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.30
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.28
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.26
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.24
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.22
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.20
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.18
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.16
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.14
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.12
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.10
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.3.0.8
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.3.0.6
	pkgsrc-2004Q2-base:1.3
	pkgsrc-2004Q1:1.3.0.4
	pkgsrc-2004Q1-base:1.3
	pkgsrc-2003Q4:1.3.0.2
	pkgsrc-2003Q4-base:1.3
	buildlink2-base:1.3
	netbsd-1-5-RELEASE:1.2
	netbsd-1-4-PATCH003:1.2
	netbsd-1-4-PATCH002:1.2
	comdex-fall-1999:1.1;
locks; strict;
comment	@# @;


1.3
date	2000.12.12.02.11.37;	author wiz;	state dead;
branches;
next	1.2;

1.2
date	2000.02.05.15.58.29;	author wiz;	state Exp;
branches;
next	1.1;

1.1
date	99.08.08.08.40.24;	author blymn;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Added wm category to main Makefile; remove packages that have been moved
from x11 to wm; fix paths in packages that depend on the moved ones.
@
text
@$NetBSD: patch-al,v 1.2 2000/02/05 15:58:29 wiz Exp $

Index: list.c
===================================================================
RCS file: /home/siren/src/tvtwm/list.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- list.c	1999/08/08 05:46:52	1.1.1.1
+++ list.c	1999/08/08 05:56:52	1.2
@@@@ -61,6 +61,7 @@@@
     char *ptr;			/* list dependent data */
 };
 
+
 /***********************************************************************
  *
  * Wrappers to allow code to step through a list
@@@@ -185,15 +186,12 @@@@
 }
 
 static int
-MatchName(name, pattern, length, compiled, type)
+MatchName(name, pattern, compiled, type)
 char *name;
 char *pattern;
-int length;
 regexp *compiled;
 short type;
 {
-    /* fprintf(stderr, "\tcompare %s with %s\n", name, pattern); */
-
     if (type & LTYPE_ANYTHING)
 	return 1;
 
@@@@ -203,7 +201,7 @@@@
 
 	regexp_error = "";
 	if ((matcher = regcomp(pattern)) == NULL) {
-	    fprintf(stderr, "%s: Error in regexp `%s'\n", ProgramName,
+	    fprintf(stderr, "%s: Error in regexp `%s' name %s\n", ProgramName,
 			regexp_error, name);
 	    return 0;
 	}
@@@@ -224,17 +222,13 @@@@
 }
 
 char *
-MultiLookInList(list_head, name, class, /* win,*/ continuation)
+MultiLookInList(list_head, name, class, continuation)
 name_list *list_head;
 char *name;
 XClassHint *class;
-/* Window win; */
 name_list **continuation;
 {
     name_list *nptr;
-    Window win = None;
-
-    /* fprintf(stderr, "looking for %s\n", name); */
 
     for (nptr = list_head ; nptr ; nptr = nptr->next) {
 #ifdef CACHE_REGEXP
@@@@ -264,18 +258,20 @@@@
 	    return nptr->ptr;
 	}
 	if (nptr->type & LTYPE_NAME)
-	    if (MatchName(name, nptr->name, nptr->namelen, nptr->regexp, nptr->type)) {
+	    if (MatchName(name, nptr->name, nptr->regexp, nptr->type)) {
 		*continuation = nptr->next;
 		return nptr->ptr;
 	    }
 	if (class) {
 	    if (nptr->type & LTYPE_RES_NAME)
-		if (MatchName(class->res_name, nptr->name, nptr->namelen, nptr->regexp, nptr->type)) {
+		if (MatchName(class->res_name, nptr->name, nptr->regexp,
+			      nptr->type)) {
 		    *continuation = nptr->next;
 		    return nptr->ptr;
 		}
 	    if (nptr->type & LTYPE_RES_CLASS)
-		if (MatchName(class->res_class, nptr->name, nptr->namelen, nptr->regexp, nptr->type)) {
+		if (MatchName(class->res_class, nptr->name, nptr->regexp,
+			      nptr->type)) {
 		    *continuation = nptr->next;
 		    return nptr->ptr;
 		}
@@@@ -284,7 +280,7 @@@@
 	if (win && (nptr->type & LTYPE_PROPERTY)) {
 	    char *s = GetPropertyString(win, nptr->property);
 
-	    if (s && MatchName(s, nptr->name, nptr->namelen, nptr->regexp, nptr->type)) {
+	    if (s && MatchName(s, nptr->name, nptr->regexp, nptr->type)) {
 		*continuation = nptr->next;
 		free(s);
 		return nptr->ptr;
@


1.2
log
@RCS tags added
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@This set of patches does the following:
	1) makes m4 work so preprocessing of tvtwm menu files is possible
	2) general code clean up.  Code now compiles almost without
	   warnings with -Wall on.
	3) bug fixes spotted when doing (2) - things like fucntions not
	   returning values when they should and assignments in if
	   statements that were not meant to be.
@
text
@d1 2
@