mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-25 04:30:02 +00:00
da34e65cb4
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
61 lines
1.9 KiB
C
61 lines
1.9 KiB
C
/*
|
|
* QEMU base64 helpers
|
|
*
|
|
* Copyright (c) 2015 Red Hat, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/base64.h"
|
|
|
|
static const char *base64_valid_chars =
|
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n";
|
|
|
|
uint8_t *qbase64_decode(const char *input,
|
|
size_t in_len,
|
|
size_t *out_len,
|
|
Error **errp)
|
|
{
|
|
*out_len = 0;
|
|
|
|
if (in_len != -1) {
|
|
/* Lack of NUL terminator is an error */
|
|
if (input[in_len] != '\0') {
|
|
error_setg(errp, "Base64 data is not NUL terminated");
|
|
return NULL;
|
|
}
|
|
/* Check there's no NULs embedded since we expect
|
|
* this to be valid base64 data */
|
|
if (memchr(input, '\0', in_len) != NULL) {
|
|
error_setg(errp, "Base64 data contains embedded NUL characters");
|
|
return NULL;
|
|
}
|
|
|
|
/* Now we know its a valid nul terminated string
|
|
* strspn is safe to use... */
|
|
} else {
|
|
in_len = strlen(input);
|
|
}
|
|
|
|
if (strspn(input, base64_valid_chars) != in_len) {
|
|
error_setg(errp, "Base64 data contains invalid characters");
|
|
return NULL;
|
|
}
|
|
|
|
return g_base64_decode(input, out_len);
|
|
}
|