]> granicus.if.org Git - php/commitdiff
- kill local redeclaration
authorPierre Joye <pajoye@php.net>
Thu, 20 Jan 2011 06:49:17 +0000 (06:49 +0000)
committerPierre Joye <pajoye@php.net>
Thu, 20 Jan 2011 06:49:17 +0000 (06:49 +0000)
ext/com_dotnet/com_typeinfo.c

index ddbb84c7b5fcf7d2d26c4a2a0494dc9dd47b281b..e2d5d28af5c893e2c9aa429b5eb910c53eca651d 100644 (file)
@@ -120,14 +120,14 @@ PHPAPI ITypeLib *php_com_load_typelib(char *search_string, int codepage TSRMLS_D
                                                                if (ERROR_SUCCESS == RegQueryValue(hsubkey, version, libname, &libnamelen)) {
                                                                        if (0 == stricmp(libname, search_string)) {
                                                                                char *str = NULL;
-                                                                               int major, minor;
+                                                                               int major_tmp, minor_tmp;
 
                                                                                /* fetch the GUID and add the version numbers */
-                                                                               if (2 != sscanf(version, "%d.%d", &major, &minor)) {
-                                                                                       major = 1;
-                                                                                       minor = 0;
+                                                                               if (2 != sscanf(version, "%d.%d", &major_tmp, &minor_tmp)) {
+                                                                                       major_tmp = 1;
+                                                                                       minor_tmp = 0;
                                                                                }
-                                                                               spprintf(&str, 0, "%s,%d,%d", keyname, major, minor);
+                                                                               spprintf(&str, 0, "%s,%d,%d", keyname, major_tmp, minor_tmp);
                                                                                /* recurse */
                                                                                TL = php_com_load_typelib(str, codepage TSRMLS_CC);