 @@ -1,14 +1,14 @@
-/* $NetBSD: dewey.c,v 1.12 2022/07/30 08:41:25 rillig Exp $ */
+/* $NetBSD: dewey.c,v 1.13 2022/07/30 08:53:42 rillig Exp $ */
 /*
  * Copyright (c) 2002 Alistair G. Crooks.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote
 @@ -37,58 +37,58 @@
 #include <ctype.h>
 #endif
 #if HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 #include "defs.h"
 #include "dewey.h"
 #define PKG_PATTERN_MAX 1024
 /* do not modify these values, or things will NOT work */
 enum {
-        Alpha = -3,
+	Alpha = -3,
-        Beta = -2,
+	Beta = -2,
-        RC = -1,
+	RC = -1,
-        Dot = 0,
+	Dot = 0,
-        Patch = 1
+	Patch = 1
 };
 /* this struct defines a version number */
 typedef struct arr_t {
-	unsigned	c;              /* # of version numbers */
+	unsigned	c;		/* # of version numbers */
-	unsigned	size;           /* size of array */
+	unsigned	size;		/* size of array */
-	int	       *v;              /* array of decimal numbers */
+	int	       *v;		/* array of decimal numbers */
-	int		netbsd;         /* any "nb" suffix */
+	int		netbsd;		/* any "nb" suffix */
 } arr_t;
 /* this struct describes a test */
 typedef struct test_t {
-	const char     *s;              /* string representation */
+	const char     *s;		/* string representation */
-	unsigned	len;            /* length of string */
+	unsigned	len;		/* length of string */
-	int		t;              /* enumerated type of test */
+	int		t;		/* enumerated type of test */
 } test_t;
 /* the tests that are recognised. */
 const test_t	tests[] = {
-        {	"<=",	2,	DEWEY_LE	},
+	{	"<=",	2,	DEWEY_LE	},
-        {	"<",	1,	DEWEY_LT	},
+	{	"<",	1,	DEWEY_LT	},
-        {	">=",	2,	DEWEY_GE	},
+	{	">=",	2,	DEWEY_GE	},
-        {	">",	1,	DEWEY_GT	},
+	{	">",	1,	DEWEY_GT	},
-        {	"==",	2,	DEWEY_EQ	},
+	{	"==",	2,	DEWEY_EQ	},
-        {	"!=",	2,	DEWEY_NE	},
+	{	"!=",	2,	DEWEY_NE	},
-        {	NULL,	0,	0	}
+	{	NULL,	0,	0	}
 };
 const test_t	modifiers[] = {
 	{	"alpha",	5,	Alpha	},
 	{	"beta",		4,	Beta	},
 	{	"pre",		3,	RC	},
 	{	"rc",		2,	RC	},
 	{	"pl",		2,	Dot	},
 	{	"_",		1,	Dot	},
 	{	".",		1,	Dot	},
 	{	NULL,		0,	0	}
 };
 @@ -242,27 +242,27 @@ vtest(arr_t *lhs, int tst, arr_t *rhs)
 int
 dewey_cmp(const char *lhs, int op, const char *rhs)
+{
 	arr_t	right;
 	arr_t	left;
 	int retval;
 	if (!mkversion(&left, lhs))
 		return 0;
 	if (!mkversion(&right, rhs)) {
 		freeversion(&left);
 		return 0;
+	}
-        retval = vtest(&left, op, &right);
+	retval = vtest(&left, op, &right);
 	freeversion(&left);
 	freeversion(&right);
 	return retval;
+}
 /*
  * Perform dewey match on "pkg" against "pattern".
  * Return 1 on match, 0 on non-match, -1 on error.
  */
 int
 dewey_match(const char *pattern, const char *pkg)
+{
 	const char *version;
 @@ -273,29 +273,29 @@ dewey_match(const char *pattern, const c
 	/* compare names */
 	if ((version=strrchr(pkg, '-')) == NULL) {
 		return 0;
+	}
 	if ((sep = strpbrk(pattern, "<>")) == NULL)
 		return -1;
 	/* compare name lengths */
 	if ((sep-pattern != version-pkg) ||
 	    strncmp(pkg, pattern, (size_t)(version-pkg)) != 0)
 		return 0;
 	version++;
 	/* extract comparison operator */
-        if ((n = dewey_mktest(&op, sep)) < 0) {
+	if ((n = dewey_mktest(&op, sep)) < 0) {
 		return 0;
+	}
 	/* skip operator */
 	sep += n;
 	/* if greater than, look for less than */
 	sep2 = NULL;
 	if (op == DEWEY_GT || op == DEWEY_GE) {
 		if ((sep2 = strchr(sep, '<')) != NULL) {
 			if ((n = dewey_mktest(&op2, sep2)) < 0) {
 				return 0;
+			}
 			/* compare upper limit */
 			if (!dewey_cmp(version, op2, sep2+n))
 				return 0;