oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/yajl/Handle: un-inline the throwing code

Browse Source 
Reduces header dependencies.
This commit is contained in:
Max Kellermann 2020-10-28 15:59:38 +01:00
parent 6bc73a9ebe
commit 5f61d440eb
3 changed files with 54 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/lib/yajl/Handle.cxx Normal file
View File

@ -0,0 +1,47 @@
/*
* Copyright 2018-2020 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "Handle.hxx"
#include "util/RuntimeError.hxx"
#include "util/ScopeExit.hxx"
namespace Yajl {
void
Handle::ThrowError()
{
unsigned char *str = yajl_get_error(handle, false,
nullptr, 0);
AtScopeExit(this, str) {
yajl_free_error(handle, str);
};
throw FormatRuntimeError("Failed to parse JSON: %s", str);
}
} // namespace Yajl

19
src/lib/yajl/Handle.hxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2018 Max Kellermann <max.kellermann@gmail.com> * Copyright 2018-2020 Max Kellermann <max.kellermann@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -30,12 +30,8 @@
#ifndef YAJL_HANDLE_HXX #ifndef YAJL_HANDLE_HXX
#define YAJL_HANDLE_HXX #define YAJL_HANDLE_HXX
#include "util/RuntimeError.hxx"
#include "util/ScopeExit.hxx"
#include <yajl/yajl_parse.h> #include <yajl/yajl_parse.h>
#include <stdexcept>
#include <algorithm> #include <algorithm>
namespace Yajl { namespace Yajl {
@ -77,15 +73,12 @@ public:
private: private:
void HandleStatus(yajl_status status) { void HandleStatus(yajl_status status) {
if (status == yajl_status_error) { if (status == yajl_status_error)
unsigned char *str = yajl_get_error(handle, false, ThrowError();
nullptr, 0);
AtScopeExit(this, str) {
yajl_free_error(handle, str);
};
throw FormatRuntimeError("Failed to parse JSON: %s", str);
}
} }
[[noreturn]]
void ThrowError();
}; };
} // namespace Yajl } // namespace Yajl

1
src/lib/yajl/meson.build
View File

@ -5,6 +5,7 @@ endif
yajl = static_library( yajl = static_library(
'yajl', 'yajl',
'Handle.cxx',
'ResponseParser.cxx', 'ResponseParser.cxx',
'ParseInputStream.cxx', 'ParseInputStream.cxx',
include_directories: inc, include_directories: inc,