Replace PEAR_ERROR with return null and delete PEAR.inc (#3006)

This commit is contained in:
Michael Steenbeek 2018-12-04 09:53:09 +01:00 committed by Ad Schellevis
parent d699c38647
commit 2a149a054c
3 changed files with 3 additions and 1113 deletions

1
plist
View File

@ -6,7 +6,6 @@
/usr/local/etc/dh-parameters.3072.rfc7919
/usr/local/etc/dh-parameters.4096.rfc7919
/usr/local/etc/inc/IPv6.inc
/usr/local/etc/inc/PEAR.inc
/usr/local/etc/inc/XMLRPC_Client.inc
/usr/local/etc/inc/auth.inc
/usr/local/etc/inc/authgui.inc

View File

@ -276,9 +276,7 @@ class Net_IPv6
$addr = $elements[0];
$bits = $elements[1];
} else {
include_once 'PEAR.inc';
return PEAR::raiseError(NET_IPV6_NO_NETMASK_MSG,
NET_IPV6_NO_NETMASK);
return null;
}
} else {
$addr = $ip;
@ -325,9 +323,7 @@ class Net_IPv6
}
if (null == $bits) {
include_once 'PEAR.inc';
return PEAR::raiseError(NET_IPV6_NO_NETMASK_MSG,
NET_IPV6_NO_NETMASK);
return null;
}
}
}
@ -800,9 +796,7 @@ class Net_IPv6
$ip = Net_IPv6::uncompress($elements[0]);
$bitmask = $elements[1];
} else {
include_once 'PEAR.inc';
return PEAR::raiseError(NET_IPV6_NO_NETMASK_MSG,
NET_IPV6_NO_NETMASK);
return null;
}
} else {
$ip = Net_IPv6::uncompress($ipToParse);

File diff suppressed because it is too large Load Diff