xmlif/xmlif.l |   12 ++++++------

 xmlto.in      |    4 ++--

 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/xmlif/xmlif.l b/xmlif/xmlif.l

index ba71b98..75edaf4 100644

--- a/xmlif/xmlif.l

+++ b/xmlif/xmlif.l

@@ -30,7 +30,7 @@

 static char **selections;	/* selection tokens */

 static int nselections;		/* number of selections */

-static ifsense;			/* sense of last `if' or unless seen */

+static int ifsense;			/* sense of last `if' or unless seen */

 static char *attribute;		/* last attribute scanned */

 struct stack_t {

@@ -219,7 +219,7 @@ WS		[ \t\n]*

 int yywrap() {exit(0);};

-main(int argc, char *argv[])

+int main(int argc, char *argv[])

 {

     int i;

@@ -232,20 +232,20 @@ main(int argc, char *argv[])

 	    if (!strcmp(selections[i], "--help"))

 	    {

 	        printf ("usage: xmlif attrib=value..\n");

-	        exit(0);

+	        return 0;

 	    }

 	    if (!strcmp(selections[i], "--version"))

 	    {

 	        printf ("xmlif - xmlto version %s\n", VERSION);

-	        exit(0);

+	        return 0;

 	    }

 	    fprintf(stderr, "xmlif: malformed argument %d\n", i);

-	    exit(1);

+	    return 1;

 	}

-    yylex();

+    return yylex();

 }

 /*

diff --git a/xmlto.in b/xmlto.in

index 24ba478..e1df57c 100755

--- a/xmlto.in

+++ b/xmlto.in

@@ -273,8 +273,8 @@ while [ "$#" -gt "0" ]; do

 	;;

   --stringparam)

 	MYPARAM="$2"

-	XSLTPARAMS="XSLTPARAMS --stringparam ${MYPARAM%=*}"

-	XSLTPARAMS="XSLTPARAMS $MYPARAM#*=}"

+	XSLTPARAMS="$XSLTPARAMS --stringparam ${MYPARAM%=*}"

+	XSLTPARAMS="$XSLTPARAMS ${MYPARAM#*=}"

 	shift 2

 	;;

   --noclean)