[Cherokee-commits] rev 957 - cherokee/trunk/cherokee

[cherokee at cherokee-project.com]

Author: alo
Date: 2007-12-21 01:15:57 +0100 (Fri, 21 Dec 2007)
New Revision: 957
Log:

Get the changeset with:
  svn diff -r 956:957 svn://svn.cherokee-project.com/

Added:
  cherokee/trunk/cherokee/human_strcmp.c
  cherokee/trunk/cherokee/human_strcmp.h
Removed:
  cherokee/trunk/cherokee/human_sort.c
  cherokee/trunk/cherokee/human_sort.h

Deleted: cherokee/trunk/cherokee/human_sort.c

Deleted: cherokee/trunk/cherokee/human_sort.h

Copied: cherokee/trunk/cherokee/human_strcmp.c (from rev 956, cherokee/trunk/cherokee/human_sort.c)
===================================================================
--- cherokee/trunk/cherokee/human_strcmp.c	                        (rev 0)
+++ cherokee/trunk/cherokee/human_strcmp.c	2007-12-21 00:15:57 UTC (rev 957)
@@ -0,0 +1,98 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/* Cherokee
+ *
+ * Authors:
+ *      Alvaro Lopez Ortega <alvaro at alobbs.com>
+ *
+ * Copyright (C) 2001-2007 Alvaro Lopez Ortega
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+#include "common-internal.h"
+#include "human_strcmp.h"
+
+#include <ctype.h>
+
+
+static int 
+parsenum (const char *a, const char **a_ret)
+{
+	int result = *a - '0';
+
+	/* Parse the number
+	 */
+	++a;
+	while (isnumber(*a)) {
+		result *= 10;
+		result += *a - '0';
+		++a;
+	}
+
+	/* Return the new pointer
+	 */
+	if (a_ret) 
+		*a_ret = a - 1;
+
+	/* .. and the number
+	 */
+	return result;
+}
+
+
+int 
+cherokee_human_strcmp (const char *a, const char *b)
+{
+	int a0;
+	int b0;
+
+	/* Check corner cases
+	 */
+	if (unlikely (a == b))
+		return  0;
+	if (unlikely (a == NULL))
+		return -1;
+	if (unlikely (b == NULL))
+		return  1;
+
+	/* Iterate
+	 */
+	while (*a && *b) {
+		if (isnumber(*a))
+			a0 = parsenum(a, &a) + 256;
+		else
+			a0 = tolower(*a);
+
+		if (isnumber(*b))
+			b0 = parsenum(b, &b) + 256;
+		else
+			b0 = tolower(*b);
+
+		if (a0 < b0) 
+			return -1;
+		if (a0 > b0) 
+			return 1;
+
+		a++;
+		b++;
+	}
+
+	if (*a) return 1;
+	if (*b) return -1;
+
+	return 0;
+	   
+}

Copied: cherokee/trunk/cherokee/human_strcmp.h (from rev 956, cherokee/trunk/cherokee/human_sort.h)
===================================================================
--- cherokee/trunk/cherokee/human_strcmp.h	                        (rev 0)
+++ cherokee/trunk/cherokee/human_strcmp.h	2007-12-21 00:15:57 UTC (rev 957)
@@ -0,0 +1,40 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/* Cherokee
+ *
+ * Authors:
+ *      Alvaro Lopez Ortega <alvaro at alobbs.com>
+ *
+ * Copyright (C) 2001-2007 Alvaro Lopez Ortega
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+#if !defined (CHEROKEE_INSIDE_CHEROKEE_H) && !defined (CHEROKEE_COMPILATION)
+# error "Only <cherokee/cherokee.h> can be included directly, this file may disappear or change contents."
+#endif
+
+#ifndef CHEROKEE_HUMAN_STRCMP_H
+#define CHEROKEE_HUMAN_STRCMP_H
+
+#include <cherokee/common.h>
+
+CHEROKEE_BEGIN_DECLS
+
+int cherokee_human_strcmp (const char *a, const char *b);
+
+CHEROKEE_END_DECLS
+
+#endif /* CHEROKEE_HUMAN_STRCMP_H */