1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
|
diff -up libvirt-php-0.4.5/src/libvirt-php.c.php54 libvirt-php-0.4.5/src/libvirt-php.c
--- libvirt-php-0.4.5/src/libvirt-php.c.php54 2011-11-27 16:49:11.201682937 +0100
+++ libvirt-php-0.4.5/src/libvirt-php.c 2011-11-27 17:05:24.092827417 +0100
@@ -16,6 +16,11 @@
#include "libvirt-php.h"
+// From vncfunc.c
+int vnc_get_dimensions(char *server, char *port, int *width, int *height);
+// From sockets.c
+int connect_socket(char *server, char *port, int keepalive, int nodelay, int allow_server_override);
+
#ifdef DEBUG_CORE
#define DPRINTF(fmt, ...) \
if (LIBVIRT_G(debug)) \
@@ -50,7 +55,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_c
ZEND_ARG_INFO(0, readonly)
ZEND_END_ARG_INFO()
-static function_entry libvirt_functions[] = {
+static zend_function_entry libvirt_functions[] = {
/* Common functions */
PHP_FE(libvirt_get_last_error,NULL)
/* Connect functions */
@@ -775,7 +780,7 @@ unsigned long long size_def_to_mbytes(ch
return 0;
unit = arg[strlen(arg)-1];
- switch (arg[strlen(arg)-1]) {
+ switch (unit) {
case 'G':
multiplicator = 1 << 10;
break;
@@ -1419,7 +1424,7 @@ PHP_FUNCTION(libvirt_connect)
if (zend_hash_get_current_key_ex(arr_hash, &key, &key_len, &index, 0, &pointer) == HASH_KEY_IS_STRING) {
PHPWRITE(key, key_len);
} else {
- DPRINTF("%s: credentials index %d\n", PHPFUNC, index);
+ DPRINTF("%s: credentials index %d\n", PHPFUNC, (int)index);
creds[j].type=index;
creds[j].result=emalloc( Z_STRLEN_PP(data) + 1 );
memset(creds[j].result, 0, Z_STRLEN_PP(data) + 1);
@@ -1623,7 +1628,7 @@ PHP_FUNCTION(libvirt_image_create)
zval *zconn;
char msg[1024];
char cmd[4096] = { 0 };
- char *path;
+ char *path = NULL;
char fpath[4096] = { 0 };
char *image = NULL;
int image_len;
@@ -1965,7 +1970,7 @@ void dec_to_bin(unsigned long long decim
int k = 0, n = 0;
int neg_flag = 0;
int remain;
- int old_decimal;
+ // int old_decimal;
char temp[128] = { 0 };
if (decimal < 0)
@@ -1975,7 +1980,7 @@ void dec_to_bin(unsigned long long decim
}
do
{
- old_decimal = decimal;
+ // old_decimal = decimal;
remain = decimal % 2;
decimal = decimal / 2;
temp[k++] = remain + '0';
@@ -2050,7 +2055,7 @@ long get_next_free_numeric_value(virDoma
int retval = -1;
HashTable *arr_hash;
HashPosition pointer;
- int array_count;
+ // int array_count;
zval **data;
char *key;
unsigned int key_len;
@@ -2063,7 +2068,7 @@ long get_next_free_numeric_value(virDoma
free( get_string_from_xpath(xml, xpath, &output, &retval) );
arr_hash = Z_ARRVAL_P(output);
- array_count = zend_hash_num_elements(arr_hash);
+ // array_count = zend_hash_num_elements(arr_hash);
for (zend_hash_internal_pointer_reset_ex(arr_hash, &pointer);
zend_hash_get_current_data_ex(arr_hash, (void**) &data, &pointer) == SUCCESS;
zend_hash_move_forward_ex(arr_hash, &pointer)) {
@@ -2188,7 +2193,7 @@ char *connection_get_arch(virConnectPtr
int retval = -1;
char *tmp = NULL;
char *caps = NULL;
- char xpath[1024] = { 0 };
+ // char xpath[1024] = { 0 };
caps = virConnectGetCapabilities(conn);
if (caps == NULL)
@@ -2219,7 +2224,7 @@ char *generate_uuid_any()
int i;
char a[37] = { 0 };
char hexa[] = "0123456789abcdef";
- virDomainPtr domain=NULL;
+ // virDomainPtr domain=NULL;
srand(time(NULL));
for (i = 0; i < 36; i++) {
@@ -2304,7 +2309,7 @@ char *get_disk_xml(unsigned long long si
ret = WEXITSTATUS(system(cmd));
DPRINTF("%s: Command '%s' finished with error code %d\n", __FUNCTION__, cmd, ret);
if (ret != 0) {
- DPRINTF("%s: File creation failed\n");
+ DPRINTF("%s: File creation failed\n", path);
return NULL;
}
@@ -2387,7 +2392,7 @@ char *installation_get_xml(int step, vir
char features[128] = { 0 };
char *tmp = NULL;
char type[64] = { 0 };
- virDomainPtr domain=NULL;
+ // virDomainPtr domain=NULL;
if (conn == NULL) {
DPRINTF("%s: Invalid libvirt connection pointer\n", __FUNCTION__);
@@ -2978,7 +2983,7 @@ PHP_FUNCTION(libvirt_domain_send_keys)
GET_DOMAIN_FROM_ARGS("rss",&zdomain, &hostname, &hostname_len, &keys, &keys_len);
- DPRINTF("%s: Sending %d VNC keys to %s...\n", PHPFUNC, strlen(keys), hostname);
+ DPRINTF("%s: Sending %d VNC keys to %s...\n", PHPFUNC, (int)strlen(keys), hostname);
xml=virDomainGetXMLDesc(domain->domain, 0);
if (xml==NULL) {
@@ -2992,7 +2997,7 @@ PHP_FUNCTION(libvirt_domain_send_keys)
RETURN_FALSE;
}
- DPRINTF("%s: About to send string '%s' (%d keys) to %s:%s\n", PHPFUNC, keys, strlen(keys), hostname, tmp);
+ DPRINTF("%s: About to send string '%s' (%d keys) to %s:%s\n", PHPFUNC, keys, (int)strlen(keys), hostname, tmp);
ret = vnc_send_keys(hostname, tmp, keys);
DPRINTF("%s: Sequence sending result is %d\n", PHPFUNC, ret);
@@ -3214,15 +3219,15 @@ PHP_FUNCTION(libvirt_connect_get_emulato
void parse_array(zval *arr, tVMDisk *disk, tVMNetwork *network)
{
HashTable *arr_hash;
- int array_count;
- zval **zvalue, **data;
+ // int array_count;
+ zval **data; // removed **zvalue
HashPosition pointer;
char *key;
unsigned int key_len;
unsigned long index;
arr_hash = Z_ARRVAL_P(arr);
- array_count = zend_hash_num_elements(arr_hash);
+ //array_count = zend_hash_num_elements(arr_hash);
if (disk != NULL)
memset(disk, 0, sizeof(tVMDisk));
@@ -3297,7 +3302,7 @@ PHP_FUNCTION(libvirt_domain_new)
char *tmp;
char *name;
char name_len=0;
- char *emulator;
+ // char *emulator;
char *iso_image = NULL;
int iso_image_len;
int vcpus = -1;
@@ -3308,7 +3313,7 @@ PHP_FUNCTION(libvirt_domain_new)
int maxmemMB = -1;
HashTable *arr_hash;
int numDisks, numNets, i;
- zval **zvalue, **data;
+ zval **data; // removed **zvalue
HashPosition pointer;
char vncl[2048] = { 0 };
char tmpname[1024] = { 0 };
@@ -3677,7 +3682,7 @@ PHP_FUNCTION(libvirt_domain_change_memor
long allocMem = 0;
long allocMax = 0;
int retval = -1;
- int pos = -1;
+ // int pos = -1;
int len = 0;
php_libvirt_domain *res_domain = NULL;
php_libvirt_connection *conn = NULL;
@@ -3703,7 +3708,7 @@ PHP_FUNCTION(libvirt_domain_change_memor
snprintf(new, sizeof(new), " <memory>%d</memory>\n <currentMemory>%d</currentMemory>\n", allocMax, allocMem);
tmpA = strstr(xml, "<memory>");
tmp1 = strstr(xml, "</currentMemory>") + strlen("</currentMemory>");
- pos = strlen(xml) - strlen(tmp1);
+ // pos = strlen(xml) - strlen(tmp1);
len = strlen(xml) - strlen(tmpA);
tmp2 = emalloc( ( len + 1 )* sizeof(char) );
@@ -3770,7 +3775,7 @@ PHP_FUNCTION(libvirt_domain_change_boot_
char *second = NULL;
int second_len;
int retval = -1;
- int pos = -1;
+ // int pos = -1;
int len = 0;
php_libvirt_domain *res_domain = NULL;
php_libvirt_connection *conn = NULL;
@@ -3793,7 +3798,7 @@ PHP_FUNCTION(libvirt_domain_change_boot_
tmpA = strstr(xml, "</type>") + strlen("</type>");
tmp1 = strstr(xml, "</os>");
- pos = strlen(xml) - strlen(tmp1);
+ // pos = strlen(xml) - strlen(tmp1);
len = strlen(xml) - strlen(tmpA);
tmp2 = emalloc( ( len + 1 )* sizeof(char) );
|
