ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

JSON::Any --> JSON::MaybeXS (Closes: #770). (#2151)

This commit is contained in:
Dmitry Smirnov 2018-07-11 00:27:03 +10:00 committed by Isaac Connor
parent 65564fa480
commit 756369f2d8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/ZoneMinder/lib/ZoneMinder/General.pm
View File

@ -557,8 +557,8 @@ our $hasJSONAny = 0;
sub _testJSON { sub _testJSON {
return if ( $testedJSON ); return if ( $testedJSON );
my $result = eval { my $result = eval {
require JSON::Any; require JSON::MaybeXS;
JSON::Any->import(); JSON::MaybeXS->import();
}; };
$testedJSON = 1; $testedJSON = 1;
$hasJSONAny = 1 if ( $result ); $hasJSONAny = 1 if ( $result );
@ -581,7 +581,7 @@ sub jsonEncode {
_testJSON(); _testJSON();
if ( $hasJSONAny ) { if ( $hasJSONAny ) {
my $string = eval { JSON::Any->objToJson( $value ) }; my $string = eval { JSON::MaybeXS->encode_json( $value ) };
Fatal( "Unable to encode object to JSON: $@" ) unless( $string ); Fatal( "Unable to encode object to JSON: $@" ) unless( $string );
return( $string ); return( $string );
} }
@ -616,7 +616,7 @@ sub jsonDecode {
_testJSON(); _testJSON();
if ( $hasJSONAny ) { if ( $hasJSONAny ) {
my $object = eval { JSON::Any->jsonToObj( $value ) }; my $object = eval { JSON::MaybeXS->decode_json( $value ) };
Fatal( "Unable to decode JSON string '$value': $@" ) unless( $object ); Fatal( "Unable to decode JSON string '$value': $@" ) unless( $object );
return( $object ); return( $object );
} }