[libvirt] [libvirt-php PATCH 10/29] add_next_index_string

[Neal Gompa]

From: Remi Collet <fedora at famillecollet.com>

---
 src/libvirt-php.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/libvirt-php.c b/src/libvirt-php.c
index ef732a3..771f3b4 100644
--- a/src/libvirt-php.c
+++ b/src/libvirt-php.c
@@ -7485,7 +7485,7 @@ PHP_FUNCTION(libvirt_list_domain_snapshots)
         array_init(return_value);
         for (i=0;i<count;i++)
         {
-            add_next_index_string(return_value, names[i], 1);
+            add_next_index_string(return_value, names[i] VIRT_COPY_OPT);
             free(names[i]);
         }
     }
@@ -7598,7 +7598,7 @@ PHP_FUNCTION(libvirt_storagepool_list_volumes)
     if ((count != expectedcount) || (count<0)) RETURN_FALSE;
     for (i=0;i<count;i++)
     {
-        add_next_index_string(return_value,  names[i],1);
+        add_next_index_string(return_value,  names[i] VIRT_COPY_OPT);
         free(names[i]);
     }
 
@@ -8491,7 +8491,7 @@ PHP_FUNCTION(libvirt_list_storagepools)
     array_init(return_value);
     for (i=0;i<count;i++)
     {
-        add_next_index_string(return_value,  names[i],1);
+        add_next_index_string(return_value,  names[i] VIRT_COPY_OPT);
         free(names[i]);
     }
     efree(names);
@@ -8509,7 +8509,7 @@ PHP_FUNCTION(libvirt_list_storagepools)
 
     for (i = 0; i < count; i++)
     {
-        add_next_index_string (return_value, names[i], 1);
+        add_next_index_string (return_value, names[i] VIRT_COPY_OPT);
         free (names[i]);
     }
     efree (names);
@@ -8547,7 +8547,7 @@ PHP_FUNCTION(libvirt_list_active_storagepools)
     array_init(return_value);
     for (i=0;i<count;i++)
     {
-        add_next_index_string(return_value,  names[i],1);
+        add_next_index_string(return_value,  names[i] VIRT_COPY_OPT);
         free(names[i]);
     }
     efree(names);
@@ -8585,7 +8585,7 @@ PHP_FUNCTION(libvirt_list_inactive_storagepools)
     array_init(return_value);
     for (i = 0; i < count; i++)
     {
-        add_next_index_string (return_value, names[i], 1);
+        add_next_index_string (return_value, names[i] VIRT_COPY_OPT);
         free (names[i]);
     }
     efree (names);
@@ -8631,7 +8631,7 @@ PHP_FUNCTION(libvirt_list_domains)
             name=virDomainGetName(domain);
             if (name != NULL) {
                 DPRINTF("%s: Found running domain %s with ID = %d\n", PHPFUNC, name, ids[i]);
-                add_next_index_string(return_value, name, 1);
+                add_next_index_string(return_value, name VIRT_COPY_OPT);
             }
             else
                 DPRINTF("%s: Cannot get ID for running domain %d\n", PHPFUNC, ids[i]);
@@ -8665,7 +8665,7 @@ PHP_FUNCTION(libvirt_list_domains)
 
     for (i=0;i<count;i++)
     {
-        add_next_index_string(return_value, names[i], 1);
+        add_next_index_string(return_value, names[i] VIRT_COPY_OPT);
         DPRINTF("%s: Found inactive domain %s\n", PHPFUNC, names[i]);
         free(names[i]);
     }
@@ -8852,7 +8852,7 @@ PHP_FUNCTION(libvirt_list_active_domains)
                 RETURN_FALSE;
             }
 
-            add_next_index_string(return_value, name, 1);
+            add_next_index_string(return_value, name VIRT_COPY_OPT);
         }
     }
     efree(ids);
@@ -8890,7 +8890,7 @@ PHP_FUNCTION(libvirt_list_inactive_domains)
     array_init(return_value);
     for (i=0;i<count;i++)
     {
-        add_next_index_string(return_value,  names[i],1);
+        add_next_index_string(return_value,  names[i] VIRT_COPY_OPT);
         free(names[i]);
     }
     efree(names);
@@ -8931,7 +8931,7 @@ PHP_FUNCTION(libvirt_list_networks)
 
         for (i=0;i<count;i++)
         {
-            add_next_index_string(return_value,  names[i], 1);
+            add_next_index_string(return_value,  names[i]);
             free(names[i]);
         }
 
@@ -8997,7 +8997,7 @@ PHP_FUNCTION(libvirt_list_nodedevs)
     array_init(return_value);
     for (i=0;i<count;i++)
     {
-        add_next_index_string(return_value,  names[i], 1);
+        add_next_index_string(return_value,  names[i] VIRT_COPY_OPT);
         free(names[i]);
     }
 
@@ -9069,7 +9069,7 @@ PHP_FUNCTION(libvirt_nodedev_capabilities)
     array_init(return_value);
     for (i=0;i<count;i++)
     {
-        add_next_index_string(return_value, names[i], 1);
+        add_next_index_string(return_value, names[i] VIRT_COPY_OPT);
         free(names[i]);
     }
 
@@ -9758,7 +9758,7 @@ PHP_FUNCTION(libvirt_get_iso_images)
         array_init(return_value);
         while ((entry = readdir(d)) != NULL) {
             if (strcasecmp(entry->d_name + strlen(entry->d_name) - 4, ".iso") == 0) {
-                add_next_index_string(return_value, entry->d_name, 1);
+                add_next_index_string(return_value, entry->d_name VIRT_COPY_OPT);
                 num++;
             }
         }
@@ -9798,7 +9798,7 @@ PHP_FUNCTION(libvirt_print_binding_resources)
             else
                 snprintf(tmp, sizeof(tmp), "Libvirt %s resource at 0x%"UINTx, translate_counter_type(binding_resources[i].type),
                          binding_resources[i].mem);
-            add_next_index_string(return_value, tmp, 1);
+            add_next_index_string(return_value, tmp VIRT_COPY_OPT);
         }
     }
 
-- 
2.5.5