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

2009-04-20 Thread Pierre-Alain Joye 
pajoye  Mon Apr 20 06:35:43 2009 UTC

  Modified files:  
/php-src/ext/standard   dns_win32.c 
  Log:
  - nuke unused vars
  - silent warnings
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns_win32.c?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/standard/dns_win32.c
diff -u php-src/ext/standard/dns_win32.c:1.7 
php-src/ext/standard/dns_win32.c:1.8
--- php-src/ext/standard/dns_win32.c:1.7Tue Mar 10 23:39:39 2009
+++ php-src/ext/standard/dns_win32.cMon Apr 20 06:35:43 2009
@@ -97,7 +97,7 @@
int type = DNS_TYPE_MX;
 
DNS_STATUS  status; /* Return value of DnsQuery_A() 
function */
-   PDNS_RECORD pResult, pRec;  /* Pointer to DNS_RECORD 
structure */
+   PDNS_RECORD pResult;  /* Pointer to DNS_RECORD structure */
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|s, hostname, 
hostname_len, rectype, rectype_len) == FAILURE) {
return;
@@ -191,7 +191,7 @@
case DNS_TYPE_HINFO:
case DNS_TYPE_TEXT:
{
-   int i = 0;
+   DWORD i = 0;
DNS_TXT_DATA *data_txt = pRec-Data.TXT;
DWORD count = data_txt-dwStringCount;
char *txt, *txt_dst;
@@ -302,7 +302,6 @@
zval *authns = NULL, *addtl = NULL;
int type, type_to_fetch, first_query = 1, store_results = 1;
int addtl_recs = 0;
-   IN_ADDR ipaddr;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|lzz, 
hostname, hostname_len, type_param, authns, addtl) == FAILURE) {
return;



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

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

2009-01-07 Thread Pierre-Alain Joye 
pajoye  Wed Jan  7 12:59:17 2009 UTC

  Modified files:  
/php-src/ext/standard   dns_win32.c 
  Log:
  - fix parameter parsing options
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns_win32.c?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/dns_win32.c
diff -u php-src/ext/standard/dns_win32.c:1.3 
php-src/ext/standard/dns_win32.c:1.4
--- php-src/ext/standard/dns_win32.c:1.3Wed Jan  7 01:37:01 2009
+++ php-src/ext/standard/dns_win32.cWed Jan  7 12:59:17 2009
@@ -299,7 +299,7 @@
int addtl_recs = 0;
IN_ADDR ipaddr;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|lz!z!, 
hostname, hostname_len, type_param, authns, addtl) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|lzz, 
hostname, hostname_len, type_param, authns, addtl) == FAILURE) {
return;
}
 



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

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

2009-01-06 Thread Pierre-Alain Joye 
pajoye  Tue Jan  6 23:50:30 2009 UTC

  Modified files:  
/php-src/ext/standard   dns_win32.c 
  Log:
  - [DOC] MFB: VC6 does not have NAPTR
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns_win32.c?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/dns_win32.c
diff -u php-src/ext/standard/dns_win32.c:1.1 
php-src/ext/standard/dns_win32.c:1.2
--- php-src/ext/standard/dns_win32.c:1.1Tue Jan  6 20:44:56 2009
+++ php-src/ext/standard/dns_win32.cTue Jan  6 23:50:30 2009
@@ -260,6 +260,7 @@
 
case DNS_TYPE_NAPTR:
{
+#ifdef DNS_NAPTR_DATA
DNS_NAPTR_DATA * data_naptr = pRec-Data.Naptr;
add_assoc_string(*subarray, type, NAPTR, 1);
add_assoc_long(*subarray, order, 
data_naptr-wOrder);
@@ -268,6 +269,7 @@
add_assoc_string(*subarray, services, 
data_naptr-pService, 1);
add_assoc_string(*subarray, regex, 
data_naptr-pRegularExpression, 1);
add_assoc_string(*subarray, replacement, 
data_naptr-pReplacement, 1);
+#endif
}
break;
 



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

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

2009-01-06 Thread Pierre-Alain Joye 
pajoye  Wed Jan  7 01:37:01 2009 UTC

  Modified files:  
/php-src/ext/standard   dns_win32.c 
  Log:
  - MFB: sanity check if we got an A as well (valid too but not desired)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns_win32.c?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/dns_win32.c
diff -u php-src/ext/standard/dns_win32.c:1.2 
php-src/ext/standard/dns_win32.c:1.3
--- php-src/ext/standard/dns_win32.c:1.2Tue Jan  6 23:50:30 2009
+++ php-src/ext/standard/dns_win32.cWed Jan  7 01:37:01 2009
@@ -71,6 +71,10 @@
for (pRec = pResult; pRec; pRec = pRec-pNext) {
DNS_SRV_DATA *srv = pRec-Data.Srv;
 
+   if (pRec-wType != DNS_TYPE_MX) {
+   continue;
+   }
+
add_next_index_string(mx_list, pRec-Data.MX.pNameExchange, 1);
if (weight_list) {
add_next_index_long(weight_list, srv-wPriority);



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