Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
5f61d440
Commit
5f61d440
authored
Oct 28, 2020
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lib/yajl/Handle: un-inline the throwing code
Reduces header dependencies.
parent
6bc73a9e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
54 additions
and
13 deletions
+54
-13
Handle.cxx
src/lib/yajl/Handle.cxx
+47
-0
Handle.hxx
src/lib/yajl/Handle.hxx
+6
-13
meson.build
src/lib/yajl/meson.build
+1
-0
No files found.
src/lib/yajl/Handle.cxx
0 → 100644
View file @
5f61d440
/*
* 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
src/lib/yajl/Handle.hxx
View file @
5f61d440
/*
* 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
* modification, are permitted provided that the following conditions
...
...
@@ -30,12 +30,8 @@
#ifndef YAJL_HANDLE_HXX
#define YAJL_HANDLE_HXX
#include "util/RuntimeError.hxx"
#include "util/ScopeExit.hxx"
#include <yajl/yajl_parse.h>
#include <stdexcept>
#include <algorithm>
namespace
Yajl
{
...
...
@@ -77,15 +73,12 @@ public:
private
:
void
HandleStatus
(
yajl_status
status
)
{
if
(
status
==
yajl_status_error
)
{
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
);
}
if
(
status
==
yajl_status_error
)
ThrowError
();
}
[[
noreturn
]]
void
ThrowError
();
};
}
// namespace Yajl
...
...
src/lib/yajl/meson.build
View file @
5f61d440
...
...
@@ -5,6 +5,7 @@ endif
yajl = static_library(
'yajl',
'Handle.cxx',
'ResponseParser.cxx',
'ParseInputStream.cxx',
include_directories: inc,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment