[PHP-CVS] cvs: php-src /ext/standard pack.c

[Dmitry Stogov]

dmitry          Mon Jul  2 10:29:49 2007 UTC

  Modified files:              
    /php-src/ext/standard       pack.c 
  Log:
  Unicode support
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/pack.c?r1=1.68&r2=1.69&diff_format=u
Index: php-src/ext/standard/pack.c
diff -u php-src/ext/standard/pack.c:1.68 php-src/ext/standard/pack.c:1.69
--- php-src/ext/standard/pack.c:1.68    Wed Jun  6 22:04:47 2007
+++ php-src/ext/standard/pack.c Mon Jul  2 10:29:49 2007
@@ -15,7 +15,7 @@
    | Author: Chris Schneider <[EMAIL PROTECTED]>                          |
    +----------------------------------------------------------------------+
  */
-/* $Id: pack.c,v 1.68 2007/06/06 22:04:47 iliaa Exp $ */
+/* $Id: pack.c,v 1.69 2007/07/02 10:29:49 dmitry Exp $ */
 
 #include "php.h"
 
@@ -659,7 +659,7 @@
                                                                break;
                                                }
 
-                                               add_assoc_stringl(return_value, 
n, &input[inputpos], len + 1, 1);
+                                               
add_rt_assoc_stringl(return_value, n, &input[inputpos], len + 1, 1);
                                                break;
                                        }
                                        
@@ -701,7 +701,7 @@
                                                }
 
                                                buf[len] = '\0';
-                                               add_assoc_stringl(return_value, 
n, buf, len, 1);
+                                               
add_rt_assoc_stringl(return_value, n, buf, len, 1);
                                                efree(buf);
                                                break;
                                        }
@@ -710,7 +710,7 @@
                                        case 'C': {
                                                int issigned = (type == 'c') ? 
(input[inputpos] & 0x80) : 0;
                                                long v = 
php_unpack(&input[inputpos], 1, issigned, byte_map);
-                                               add_assoc_long(return_value, n, 
v);
+                                               add_rt_assoc_long(return_value, 
n, v);
                                                break;
                                        }
 
@@ -731,7 +731,7 @@
                                                }
 
                                                v = 
php_unpack(&input[inputpos], 2, issigned, map);
-                                               add_assoc_long(return_value, n, 
v);
+                                               add_rt_assoc_long(return_value, 
n, v);
                                                break;
                                        }
 
@@ -747,7 +747,7 @@
                                                }
 
                                                v |= 
php_unpack(&input[inputpos], sizeof(int), issigned, int_map);
-                                               add_assoc_long(return_value, n, 
v);
+                                               add_rt_assoc_long(return_value, 
n, v);
                                                break;
                                        }
 
@@ -774,7 +774,7 @@
                                                }
 
                                                v |= 
php_unpack(&input[inputpos], 4, issigned, map);
-                                               add_assoc_long(return_value, n, 
v);
+                                               add_rt_assoc_long(return_value, 
n, v);
                                                break;
                                        }
 
@@ -782,7 +782,7 @@
                                                float v;
 
                                                memcpy(&v, &input[inputpos], 
sizeof(float));
-                                               add_assoc_double(return_value, 
n, (double)v);
+                                               
add_rt_assoc_double(return_value, n, (double)v);
                                                break;
                                        }
 
@@ -790,7 +790,7 @@
                                                double v;
 
                                                memcpy(&v, &input[inputpos], 
sizeof(double));
-                                               add_assoc_double(return_value, 
n, v);
+                                               
add_rt_assoc_double(return_value, n, v);
                                                break;
                                        }
 

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