[PHP-CVS] cvs: php4 /ext/standard uniqid.c

[Marcus Boerger]

helly           Fri Dec 20 12:06:25 2002 EDT

  Modified files:              
    /php4/ext/standard  uniqid.c 
  Log:
  @Make uniqid() parameters optional and allow any prefix length. (Marcus)
  
  
Index: php4/ext/standard/uniqid.c
diff -u php4/ext/standard/uniqid.c:1.34 php4/ext/standard/uniqid.c:1.35
--- php4/ext/standard/uniqid.c:1.34     Fri Dec 20 12:04:33 2002
+++ php4/ext/standard/uniqid.c  Fri Dec 20 12:06:25 2002
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: uniqid.c,v 1.34 2002/12/20 17:04:33 helly Exp $ */
+/* $Id: uniqid.c,v 1.35 2002/12/20 17:06:25 helly Exp $ */
 
 #include "php.h"
 
@@ -38,32 +38,27 @@
 #include "php_lcg.h"
 #include "uniqid.h"
 
-/* {{{ proto string uniqid(string prefix [, bool more_entropy])
+/* {{{ proto string uniqid([string prefix , bool more_entropy])
    Generates a unique ID */
 #ifdef HAVE_GETTIMEOFDAY
 PHP_FUNCTION(uniqid)
 {
-       char *prefix;
+       char *prefix = "";
 #if defined(__CYGWIN__)
        zend_bool more_entropy = 1;
 #else
        zend_bool more_entropy = 0;
 #endif
-       char uniqid[138];
-       int sec, usec, argc, prefix_len;
+       char *uniqid;
+       int sec, usec, argc, prefix_len = 0;
        struct timeval tv;
 
        argc = ZEND_NUM_ARGS();
-       if (zend_parse_parameters(argc TSRMLS_CC, "s|b", &prefix, &prefix_len,
+       if (zend_parse_parameters(argc TSRMLS_CC, "|sb", &prefix, &prefix_len,
                                                          &more_entropy)) {
                return;
        }
 
-       /* Do some bounds checking since we are using a char array. */
-       if (prefix_len > 114) {
-               php_error_docref(NULL TSRMLS_CC, E_ERROR, "The prefix to uniqid should 
not be more than 114 characters.");
-               return;
-       }
 #if HAVE_USLEEP && !defined(PHP_WIN32)
        if (!more_entropy) {
 #if defined(__CYGWIN__)
@@ -82,12 +77,12 @@
         * digits for usecs.
         */
        if (more_entropy) {
-               sprintf(uniqid, "%s%08x%05x%.8f", prefix, sec, usec, 
php_combined_lcg(TSRMLS_C) * 10);
+               spprintf(&uniqid, 0, "%s%08x%05x%.8f", prefix, sec, usec, 
+php_combined_lcg(TSRMLS_C) * 10);
        } else {
-               sprintf(uniqid, "%s%08x%05x", prefix, sec, usec);
+               spprintf(&uniqid, 0, "%s%08x%05x", prefix, sec, usec);
        }
 
-       RETURN_STRING(uniqid, 1);
+       RETURN_STRING(uniqid, 0);
 }
 #endif
 /* }}} */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php