1 files changed, 75 insertions, 86 deletions

diff --git a/src/interval.c b/src/interval.c
index cf46b4c..049091d 100644
--- a/src/interval.c
+++ b/src/interval.c
@@ -1,5 +1,5 @@
 /* wydawca - automatic release submission daemon
-   Copyright (C) 2007, 2009-2011 Sergey Poznyakoff
+   Copyright (C) 2007, 2009-2013 Sergey Poznyakoff
 
    Wydawca is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -23,97 +23,86 @@
 #include "wydawca.h"
 
 static int
-time_multiplier (const char *str, unsigned *m, unsigned *plen)
+time_multiplier(const char *str, unsigned *m, unsigned *plen)
 {
-  static struct timetab
-  {
-    char *name;
-    unsigned mul;
-  } tab[] = {
-    { "seconds", 1 },
-    { "minutes", 60 },
-    { "hours", 60*60 },
-    { "days",  24*60*60 },
-    { "weeks", 7*24*60*60 },
-    { "months", 31*7*24*60*60 },
-    { NULL }
-  };
-  struct timetab *p;
-  int slen;
-
-  for (slen = 0; str[slen]; slen++)
-    if (isspace (str[slen]))
-      break;
-
-  for (p = tab; p->name; p++)
-    {
-      if (p->name[0] == tolower (str[0]))
-	{
-	  int nlen = strlen (p->name);
-
-	  if (nlen > slen)
-	    nlen = slen;
-
-	  if (strncasecmp (p->name, str, nlen) == 0)
-	    {
-	      *m = p->mul;
-	      if (plen)
-		*plen = nlen;
-	      return 0;
-	    }
+	static struct timetab {
+		char *name;
+		unsigned mul;
+	} tab[] = {
+		{ "seconds", 1 },
+		{ "minutes", 60 },
+		{ "hours", 60 * 60 },
+		{ "days", 24 * 60 * 60 },
+		{ "weeks", 7 * 24 * 60 * 60 },
+		{ "months", 31 * 7 * 24 * 60 * 60 },
+		{ NULL }
+	};
+	struct timetab *p;
+	int slen;
+
+	for (slen = 0; str[slen]; slen++)
+		if (isspace(str[slen]))
+			break;
+
+	for (p = tab; p->name; p++) {
+		if (p->name[0] == tolower(str[0])) {
+			int nlen = strlen(p->name);
+
+			if (nlen > slen)
+				nlen = slen;
+
+			if (strncasecmp(p->name, str, nlen) == 0) {
+				*m = p->mul;
+				if (plen)
+					*plen = nlen;
+				return 0;
+			}
+		}
 	}
-    }
-  return 1;
+	return 1;
 }
 
 int
-parse_time_interval (const char *str, time_t *pint, const char **endp)
+parse_time_interval(const char *str, time_t * pint, const char **endp)
 {
-  int rc = 0;
-  time_t interval = 0;
-
-  while (*str)
-    {
-      char *p;
-      unsigned long n;
-      unsigned mul, len;
-
-      while (*str && isspace (*str))
-	str++;
-
-      if (!isdigit (*str) && time_multiplier (str, &mul, &len) == 0)
-	{
-	  n = 1;
-	  str += len;
+	int rc = 0;
+	time_t interval = 0;
+
+	while (*str) {
+		char *p;
+		unsigned long n;
+		unsigned mul, len;
+
+		while (*str && isspace(*str))
+			str++;
+
+		if (!isdigit(*str) && time_multiplier(str, &mul, &len) == 0) {
+			n = 1;
+			str += len;
+		} else {
+			n = strtoul(str, &p, 10);
+			if (*p && !isspace(*p)) {
+				str = p;
+				rc = 1;
+				break;
+			}
+
+			while (*p && isspace(*p))
+				p++;
+
+			str = p;
+			if (*str) {
+				if (rc = time_multiplier(str, &mul, &len))
+					break;
+				str += len;
+			} else
+				mul = 1;
+		}
+		interval += n * mul;
 	}
-      else
-	{
-	  n = strtoul (str, &p, 10);
-	  if (*p && !isspace (*p))
-	    {
-	      str = p;
-	      rc = 1;
-	      break;
-	    }
-
-	  while (*p && isspace (*p))
-	    p++;
-
-	  str = p;
-	  if (*str)
-	    {
-	      if (rc = time_multiplier (str, &mul, &len))
-		break;
-	      str += len;
-	    }
-	  else
-	    mul = 1;
-	}
-      interval += n * mul;
-    }
 
-  if (rc && endp)
-    *endp = str;
-  *pint = interval;
-  return rc;
+	if (rc && endp)
+		*endp = str;
+	*pint = interval;
+	return rc;
 }