let the ctor honor the options array too

[m6w6/ext-http] / php_http_strlist.c

diff --git a/php_http_strlist.c b/php_http_strlist.c
index a00f201f7b7bff1d48d5875157f8308665babfe3..35acf409323430cd491b1151d4abc54033aa344a 100644 (file)
--- a/php_http_strlist.c
+++ b/php_http_strlist.c
@@ -1,5 +1,16 @@
-
-#include "php_http.h"
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
+
+#include "php_http_api.h"
 
 PHP_HTTP_API php_http_strlist_iterator_t *php_http_strlist_iterator_init(php_http_strlist_iterator_t *iter, const char list[], unsigned factor)
 {
@@ -56,9 +67,16 @@ PHP_HTTP_API void php_http_strlist_iterator_free(php_http_strlist_iterator_t **i
 
 PHP_HTTP_API const char *php_http_strlist_find(const char list[], unsigned factor, unsigned item)
 {
-       unsigned M = 0, m = 0, major = (item / factor) - 1, minor = (item % factor);
+       unsigned M = 0, m = 0, major, minor;
        const char *p = &list[0];
 
+       if (factor) {
+               major = (item / factor) - 1;
+               minor = item % factor;
+       } else {
+               major = 0;
+               minor = item;
+       }
     while (*p && major != M++) {
         while (*p) {
             while (*p) {
@@ -78,3 +96,13 @@ PHP_HTTP_API const char *php_http_strlist_find(const char list[], unsigned facto
 
     return p;
 }
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+