|
[-]
[+]
|
Changed |
_service:tar_git:libhybris.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/mer-hybris/libhybris.git</param>
<param name="branch">master</param>
- <param name="revision">0.0.5.36</param>
+ <param name="revision">0.0.5.37</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/compat/camera/camera_compatibility_layer.cpp
^
|
| @@ -141,10 +141,12 @@
(void) data;
}
+#if ANDROID_VERSION_MAJOR >= 7
void CameraControl::postRecordingFrameHandleTimestamp(nsecs_t /*timestamp*/, native_handle_t* /*handle*/)
{
REPORT_FUNCTION();
}
+#endif
#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
namespace android
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/compat/camera/direct_camera_test.cpp
^
|
| @@ -121,12 +121,12 @@
void raw_data_cb(void* data, uint32_t data_size, void* context)
{
- printf("%s: %d \n", __PRETTY_FUNCTION__, data_size);
+ printf("%s: %u \n", __PRETTY_FUNCTION__, data_size);
}
void jpeg_data_cb(void* data, uint32_t data_size, void* context)
{
- printf("%s: %d \n", __PRETTY_FUNCTION__, data_size);
+ printf("%s: %u \n", __PRETTY_FUNCTION__, data_size);
char fn[256];
sprintf(fn, "/cache/shot_%d.jpeg", shot_counter);
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/compat/media/direct_media_test.cpp
^
|
| @@ -289,7 +289,7 @@
static void print_gl_error(unsigned int line)
{
GLint error = glGetError();
- printf("GL error: %#04x (line: %d)\n", error, line);
+ printf("GL error: %#04x (line: %u)\n", error, line);
}
static int update_gl_buffer(RenderData *render_data, EGLDisplay *disp, EGLSurface *surface)
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/compat/media/media_format_layer_priv.cpp
^
|
| @@ -46,5 +46,3 @@
#ifdef __cplusplus
}
#endif
-
-#endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/compat/media/media_recorder.cpp
^
|
| @@ -34,7 +34,9 @@
#include <media/mediaplayer.h> // for MEDIA_ERROR_SERVER_DIED
#include <gui/IGraphicBufferProducer.h>
namespace a = android;
+#if ANDROID_VERSION_MAJOR >= 7
namespace ah = android::hardware;
+#endif
#if ANDROID_VERSION_MAJOR >= 7
a::status_t a::MediaRecorder::setCamera(const sp<ah::ICamera>& camera, const sp<ICameraRecordingProxy>& proxy)
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/hybris/autogen.sh
^
|
| @@ -1,14 +1,14 @@
#!/bin/sh
-srcdir=`dirname $0`
+srcdir=$(dirname "$0")
test -z "$srcdir" && srcdir=.
-ORIGDIR=`pwd`
+ORIGDIR=$(pwd)
cd $srcdir
autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
+cd "$ORIGDIR" || exit $?
-if [ x$NOCONFIGURE = x ]; then
+if [ x"$NOCONFIGURE" = x ]; then
$srcdir/configure "$@"
fi
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/hybris/common/hooks.c
^
|
| @@ -325,9 +325,19 @@
{
TRACE_HOOK("size %zu", size);
+ void *res = malloc(size);
+
+ TRACE_HOOK("res %p", res);
+
+ return res;
+}
+
#ifdef WANT_ADRENO_QUIRKS
- if(size == 4) size = 5;
-#endif
+static void *_hybris_hook_malloc45(size_t size)
+{
+ TRACE_HOOK("size %zu", size);
+
+ if (size == 4) size = 5;
void *res = malloc(size);
@@ -335,6 +345,7 @@
return res;
}
+#endif
static size_t _hybris_hook_malloc_usable_size (void *ptr)
{
@@ -347,6 +358,10 @@
{
TRACE_HOOK("dst %p src %p len %zu", dst, src, len);
+ if (src == dst) {
+ return dst;
+ }
+
if (src == NULL || dst == NULL)
return dst;
@@ -1387,7 +1402,7 @@
typedef off_t bionic_fpos_t;
/* "struct __sFILE" from bionic/libc/include/stdio.h */
-struct __attribute__((packed)) bionic_file {
+struct bionic_file {
unsigned char *_p; /* current position in (some) buffer */
int _r; /* read space left for getc() */
int _w; /* write space left for putc() */
@@ -2054,28 +2069,28 @@
static int _hybris_hook___system_property_update(void *pi, const char *value, unsigned int len)
{
- TRACE_HOOK("pi %p value '%s' len %d", pi, value, len);
+ TRACE_HOOK("pi %p value '%s' len %u", pi, value, len);
return 0;
}
static int _hybris_hook___system_property_add(const char *name, unsigned int namelen, const char *value, unsigned int valuelen)
{
- TRACE_HOOK("name '%s' namelen %d value '%s' valuelen %d",
+ TRACE_HOOK("name '%s' namelen %u value '%s' valuelen %u",
name, namelen, value, valuelen);
return 0;
}
static unsigned int _hybris_hook___system_property_wait_any(unsigned int serial)
{
- TRACE_HOOK("serial %d", serial);
+ TRACE_HOOK("serial %u", serial);
return 0;
}
static const void *_hybris_hook___system_property_find_nth(unsigned n)
{
- TRACE_HOOK("n %d", n);
+ TRACE_HOOK("n %u", n);
return NULL;
}
@@ -2607,7 +2622,7 @@
void _hybris_hook_android_set_application_target_sdk_version(uint32_t target)
{
- TRACE("target %d", target);
+ TRACE("target %u", target);
_android_set_application_target_sdk_version(target);
}
@@ -2653,12 +2668,9 @@
return _android_get_exported_namespace(name);
}
-/* this was added while debugging in the hopes to get a backtrace from a double
- * free crash. Unfortunately it fixes the problem so we cannot get a proper
- * backtrace to fix the underlying problem. */
void _hybris_hook_free(void *ptr)
{
- if (ptr) ((char*)ptr)[0] = 0;
+ TRACE_HOOK("ptr %p", ptr);
free(ptr);
}
@@ -3180,6 +3192,12 @@
return (void*) found;
}
+#ifdef WANT_ADRENO_QUIRKS
+ if (strstr(requester, "libllvm-glnext.so") != NULL && strcmp(sym, "malloc") == 0) {
+ return _hybris_hook_malloc45;
+ }
+#endif
+
if (!sorted)
{
qsort(hooks_properties, HOOKS_SIZE(hooks_properties), sizeof(hooks_properties[0]), hook_cmp);
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/hybris/common/mm/linker.cpp
^
|
| @@ -468,7 +468,7 @@
offset += verdef->vd_next;
if (verdef->vd_version != 1) {
- DL_ERR("unsupported verdef[%zd] vd_version: %d (expected 1) library: %s",
+ DL_ERR("unsupported verdef[%zu] vd_version: %d (expected 1) library: %s",
i, verdef->vd_version, si->get_realpath());
return false;
}
@@ -482,7 +482,7 @@
}
if (verdef->vd_cnt == 0) {
- DL_ERR("invalid verdef[%zd] vd_cnt == 0 (version without a name)", i);
+ DL_ERR("invalid verdef[%zu] vd_cnt == 0 (version without a name)", i);
return false;
}
@@ -614,7 +614,7 @@
check_symbol_version(verneed, verdef) &&
strcmp(get_string(s->st_name), symbol_name.get_name()) == 0 &&
is_symbol_global_and_defined(this, s)) {
- TRACE_TYPE(LOOKUP, "FOUND %s in %s (%p) %zd",
+ TRACE_TYPE(LOOKUP, "FOUND %s in %s (%p) %zu",
symbol_name.get_name(), get_realpath(), reinterpret_cast<void*>(s->st_value),
static_cast<size_t>(s->st_size));
*symbol_index = n;
@@ -633,7 +633,7 @@
uint32_t* symbol_index) const {
uint32_t hash = symbol_name.elf_hash();
- TRACE_TYPE(LOOKUP, "SEARCH %s in %s@%p h=%x(elf) %zd",
+ TRACE_TYPE(LOOKUP, "SEARCH %s in %s@%p h=%x(elf) %zu",
symbol_name.get_name(), get_realpath(),
reinterpret_cast<void*>(base), hash, hash % nbucket_);
@@ -654,7 +654,7 @@
if (check_symbol_version(verneed, verdef) &&
strcmp(get_string(s->st_name), symbol_name.get_name()) == 0 &&
is_symbol_global_and_defined(this, s)) {
- TRACE_TYPE(LOOKUP, "FOUND %s in %s (%p) %zd",
+ TRACE_TYPE(LOOKUP, "FOUND %s in %s (%p) %zu",
symbol_name.get_name(), get_realpath(),
reinterpret_cast<void*>(s->st_value),
static_cast<size_t>(s->st_size));
@@ -663,7 +663,7 @@
}
}
- TRACE_TYPE(LOOKUP, "NOT FOUND %s in %s@%p %x %zd",
+ TRACE_TYPE(LOOKUP, "NOT FOUND %s in %s@%p %x %zu",
symbol_name.get_name(), get_realpath(),
reinterpret_cast<void*>(base), hash, hash % nbucket_);
@@ -1609,7 +1609,7 @@
soinfo_unload(si);
}
} else {
- TRACE("not unloading '%s' group, decrementing ref_count to %zd",
+ TRACE("not unloading '%s' group, decrementing ref_count to %zu",
root->get_realpath(), ref_count);
}
}
@@ -1715,7 +1715,7 @@
offset += verneed->vn_next;
if (verneed->vn_version != 1) {
- DL_ERR("unsupported verneed[%zd] vn_version: %d (expected 1)", i, verneed->vn_version);
+ DL_ERR("unsupported verneed[%zu] vn_version: %d (expected 1)", i, verneed->vn_version);
return false;
}
@@ -1726,7 +1726,7 @@
});
if (target_si == nullptr) {
- DL_ERR("cannot find \"%s\" from verneed[%zd] in DT_NEEDED list for \"%s\"",
+ DL_ERR("cannot find \"%s\" from verneed[%zu] in DT_NEEDED list for \"%s\"",
target_soname, i, si_from->get_realpath());
return false;
}
@@ -1817,7 +1817,7 @@
const char* sym_name = nullptr;
ElfW(Addr) addend = get_addend(rel, reloc);
- DEBUG("Processing '%s' relocation at index %zd", get_realpath(), idx);
+ DEBUG("Processing '%s' relocation at index %zu", get_realpath(), idx);
if (type == R_GENERIC_NONE) {
continue;
}
@@ -2216,7 +2216,7 @@
return;
}
- TRACE("[ Calling %s (size %zd) @ %p for '%s' ]", array_name, count, functions, get_realpath());
+ TRACE("[ Calling %s (size %zu) @ %p for '%s' ]", array_name, count, functions, get_realpath());
int begin = reverse ? (count - 1) : 0;
int end = reverse ? -1 : count;
@@ -2270,7 +2270,7 @@
if (!is_main_executable() && preinit_array_ != nullptr) {
// The GNU dynamic linker silently ignores these, but we warn the developer.
- PRINT("\"%s\": ignoring %zd-entry DT_PREINIT_ARRAY in shared library!",
+ PRINT("\"%s\": ignoring %zu-entry DT_PREINIT_ARRAY in shared library!",
get_realpath(), preinit_array_count_);
}
@@ -2591,7 +2591,7 @@
case DT_SYMENT:
if (d->d_un.d_val != sizeof(ElfW(Sym))) {
- DL_ERR("invalid DT_SYMENT: %zd in \"%s\"",
+ DL_ERR("invalid DT_SYMENT: %zu in \"%s\"",
static_cast<size_t>(d->d_un.d_val), get_realpath());
return false;
}
@@ -2675,7 +2675,7 @@
case DT_RELAENT:
if (d->d_un.d_val != sizeof(ElfW(Rela))) {
- DL_ERR("invalid DT_RELAENT: %zd", static_cast<size_t>(d->d_un.d_val));
+ DL_ERR("invalid DT_RELAENT: %zu", static_cast<size_t>(d->d_un.d_val));
return false;
}
break;
@@ -2703,7 +2703,7 @@
case DT_RELENT:
if (d->d_un.d_val != sizeof(ElfW(Rel))) {
- DL_ERR("invalid DT_RELENT: %zd", static_cast<size_t>(d->d_un.d_val));
+ DL_ERR("invalid DT_RELENT: %zu", static_cast<size_t>(d->d_un.d_val));
return false;
}
break;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/hybris/common/mm/linker_phdr.cpp
^
|
| @@ -165,7 +165,7 @@
}
if (rc != sizeof(header_)) {
- DL_ERR("\"%s\" is too small to be an ELF executable: only found %zd bytes", name_,
+ DL_ERR("\"%s\" is too small to be an ELF executable: only found %zu bytes", name_,
static_cast<size_t>(rc));
return false;
}
@@ -232,7 +232,7 @@
// Like the kernel, we only accept program header tables that
// are smaller than 64KiB.
if (phdr_num_ < 1 || phdr_num_ > 65536/sizeof(ElfW(Phdr))) {
- DL_ERR("\"%s\" has invalid e_phnum: %zd", name_, phdr_num_);
+ DL_ERR("\"%s\" has invalid e_phnum: %zu", name_, phdr_num_);
return false;
}
@@ -336,14 +336,14 @@
if (load_size_ > reserved_size) {
if (!reserved_hint) {
- DL_ERR("reserved address space %zd smaller than %zd bytes needed for \"%s\"",
+ DL_ERR("reserved address space %zu smaller than %zu bytes needed for \"%s\"",
reserved_size - load_size_, load_size_, name_);
return false;
}
int mmap_flags = MAP_PRIVATE | MAP_ANONYMOUS;
start = mmap(mmap_hint, load_size_, PROT_NONE, mmap_flags, -1, 0);
if (start == MAP_FAILED) {
- DL_ERR("couldn't reserve %zd bytes of address space for \"%s\"", load_size_, name_);
+ DL_ERR("couldn't reserve %zu bytes of address space for \"%s\"", load_size_, name_);
return false;
}
} else {
@@ -401,7 +401,7 @@
fd_,
file_offset_ + file_page_start);
if (seg_addr == MAP_FAILED) {
- DL_ERR("couldn't map \"%s\" segment %zd: %s", name_, i, strerror(errno));
+ DL_ERR("couldn't map \"%s\" segment %zu: %s", name_, i, strerror(errno));
return false;
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/hybris/common/n/linker_phdr.cpp
^
|
| @@ -191,7 +191,7 @@
}
if (rc != sizeof(header_)) {
- DL_ERR("\"%s\" is too small to be an ELF executable: only found %zd bytes", name_.c_str(),
+ DL_ERR("\"%s\" is too small to be an ELF executable: only found %zu bytes", name_.c_str(),
static_cast<size_t>(rc));
return false;
}
@@ -269,7 +269,7 @@
// Like the kernel, we only accept program header tables that
// are smaller than 64KiB.
if (phdr_num_ < 1 || phdr_num_ > 65536/sizeof(ElfW(Phdr))) {
- DL_ERR("\"%s\" has invalid e_phnum: %zd", name_.c_str(), phdr_num_);
+ DL_ERR("\"%s\" has invalid e_phnum: %zu", name_.c_str(), phdr_num_);
return false;
}
@@ -462,19 +462,19 @@
if (load_size_ > reserved_size) {
if (!reserved_hint) {
- DL_ERR("reserved address space %zd smaller than %zd bytes needed for \"%s\"",
+ DL_ERR("reserved address space %zu smaller than %zu bytes needed for \"%s\"",
reserved_size - load_size_, load_size_, name_.c_str());
return false;
}
int mmap_flags = MAP_PRIVATE | MAP_ANONYMOUS;
start = mmap(mmap_hint, load_size_, PROT_NONE, mmap_flags, -1, 0);
if (start == MAP_FAILED) {
- DL_ERR("couldn't reserve %zd bytes of address space for \"%s\"", load_size_, name_.c_str());
+ DL_ERR("couldn't reserve %zu bytes of address space for \"%s\"", load_size_, name_.c_str());
return false;
}
if (strict_hint && (start != mmap_hint)) {
munmap(start, load_size_);
- DL_ERR("couldn't reserve %zd bytes of address space at %p for \"%s\"",
+ DL_ERR("couldn't reserve %zu bytes of address space at %p for \"%s\"",
load_size_, mmap_hint, name_.c_str());
return false;
}
@@ -543,7 +543,7 @@
fd_,
file_offset_ + file_page_start);
if (seg_addr == MAP_FAILED) {
- DL_ERR("couldn't map \"%s\" segment %zd: %s", name_.c_str(), i, strerror(errno));
+ DL_ERR("couldn't map \"%s\" segment %zu: %s", name_.c_str(), i, strerror(errno));
return false;
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/hybris/common/o/linker.cpp
^
|
| @@ -1853,7 +1853,7 @@
if (ref_count == 0) {
unload_list.push_back(si);
} else {
- TRACE("not unloading '%s' group, decrementing ref_count to %zd",
+ TRACE("not unloading '%s' group, decrementing ref_count to %zu",
si->get_realpath(), ref_count);
}
} else {
@@ -2424,7 +2424,7 @@
offset += verneed->vn_next;
if (verneed->vn_version != 1) {
- DL_ERR("unsupported verneed[%zd] vn_version: %d (expected 1)", i, verneed->vn_version);
+ DL_ERR("unsupported verneed[%zu] vn_version: %d (expected 1)", i, verneed->vn_version);
return false;
}
@@ -2435,7 +2435,7 @@
});
if (target_si == nullptr) {
- DL_ERR("cannot find \"%s\" from verneed[%zd] in DT_NEEDED list for \"%s\"",
+ DL_ERR("cannot find \"%s\" from verneed[%zu] in DT_NEEDED list for \"%s\"",
target_soname, i, si_from->get_realpath());
return false;
}
@@ -2475,7 +2475,7 @@
offset += verdef->vd_next;
if (verdef->vd_version != 1) {
- DL_ERR("unsupported verdef[%zd] vd_version: %d (expected 1) library: %s",
+ DL_ERR("unsupported verdef[%zu] vd_version: %d (expected 1) library: %s",
i, verdef->vd_version, si->get_realpath());
return false;
}
@@ -2489,7 +2489,7 @@
}
if (verdef->vd_cnt == 0) {
- DL_ERR("invalid verdef[%zd] vd_cnt == 0 (version without a name)", i);
+ DL_ERR("invalid verdef[%zu] vd_cnt == 0 (version without a name)", i);
return false;
}
@@ -2599,7 +2599,7 @@
const char* sym_name = nullptr;
ElfW(Addr) addend = get_addend(rel, reloc);
- DEBUG("Processing \"%s\" relocation at index %zd", get_realpath(), idx);
+ DEBUG("Processing \"%s\" relocation at index %zu", get_realpath(), idx);
if (type == R_GENERIC_NONE) {
continue;
}
@@ -3076,7 +3076,7 @@
case DT_SYMENT:
if (d->d_un.d_val != sizeof(ElfW(Sym))) {
- DL_ERR("invalid DT_SYMENT: %zd in \"%s\"",
+ DL_ERR("invalid DT_SYMENT: %zu in \"%s\"",
static_cast<size_t>(d->d_un.d_val), get_realpath());
return false;
}
@@ -3160,7 +3160,7 @@
case DT_RELAENT:
if (d->d_un.d_val != sizeof(ElfW(Rela))) {
- DL_ERR("invalid DT_RELAENT: %zd", static_cast<size_t>(d->d_un.d_val));
+ DL_ERR("invalid DT_RELAENT: %zu", static_cast<size_t>(d->d_un.d_val));
return false;
}
break;
@@ -3188,7 +3188,7 @@
case DT_RELENT:
if (d->d_un.d_val != sizeof(ElfW(Rel))) {
- DL_ERR("invalid DT_RELENT: %zd", static_cast<size_t>(d->d_un.d_val));
+ DL_ERR("invalid DT_RELENT: %zu", static_cast<size_t>(d->d_un.d_val));
return false;
}
break;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/hybris/common/o/linker_cfi.cpp
^
|
| @@ -168,13 +168,13 @@
}
uintptr_t cfi_check = soinfo_find_cfi_check(si);
if (cfi_check == 0) {
- INFO("[ CFI add 0x%zx + 0x%zx %s ]", static_cast<uintptr_t>(si->base),
+ INFO("[ CFI add 0x%lx + 0x%lx %s ]", static_cast<uintptr_t>(si->base),
static_cast<uintptr_t>(si->size), si->get_soname());
AddUnchecked(si->base, si->base + si->size);
return true;
}
- INFO("[ CFI add 0x%zx + 0x%zx %s: 0x%zx ]", static_cast<uintptr_t>(si->base),
+ INFO("[ CFI add 0x%lx + 0x%lx %s: 0x%lx ]", static_cast<uintptr_t>(si->base),
static_cast<uintptr_t>(si->size), si->get_soname(), cfi_check);
#ifdef __arm__
// Require Thumb encoding.
@@ -265,7 +265,7 @@
void CFIShadowWriter::BeforeUnload(soinfo* si) {
if (shadow_start == nullptr) return;
if (si->base == 0 || si->size == 0) return;
- INFO("[ CFI remove 0x%zx + 0x%zx: %s ]", static_cast<uintptr_t>(si->base),
+ INFO("[ CFI remove 0x%lx + 0x%lx: %s ]", static_cast<uintptr_t>(si->base),
static_cast<uintptr_t>(si->size), si->get_soname());
AddInvalid(si->base, si->base + si->size);
FixupVmaName();
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/hybris/common/o/linker_config.cpp
^
|
| @@ -182,7 +182,7 @@
int result = cp.next_token(&name, &value, &error);
if (result == ConfigParser::kError) {
- DL_WARN("error parsing %s:%zd: %s (ignoring this line)",
+ DL_WARN("error parsing %s:%zu: %s (ignoring this line)",
ld_config_file_path,
cp.lineno(),
error.c_str());
@@ -195,7 +195,7 @@
if (result == ConfigParser::kProperty) {
if (!startsWith(name, "dir.")) {
- DL_WARN("error parsing %s:%zd: unexpected property name \"%s\", "
+ DL_WARN("error parsing %s:%zu: unexpected property name \"%s\", "
"expected format dir.<section_name> (ignoring this line)",
ld_config_file_path,
cp.lineno(),
@@ -209,7 +209,7 @@
}
if (value.empty()) {
- DL_WARN("error parsing %s:%zd: property value is empty (ignoring this line)",
+ DL_WARN("error parsing %s:%zu: property value is empty (ignoring this line)",
ld_config_file_path,
cp.lineno());
continue;
@@ -256,7 +256,7 @@
if (result == ConfigParser::kProperty) {
if (properties->find(name) != properties->end()) {
- DL_WARN("%s:%zd: warning: property \"%s\" redefinition",
+ DL_WARN("%s:%zu: warning: property \"%s\" redefinition",
ld_config_file_path,
cp.lineno(),
name.c_str());
@@ -266,7 +266,7 @@
}
if (result == ConfigParser::kError) {
- DL_WARN("error parsing %s:%zd: %s (ignoring this line)",
+ DL_WARN("error parsing %s:%zu: %s (ignoring this line)",
ld_config_file_path,
cp.lineno(),
error.c_str());
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/hybris/common/o/linker_phdr.cpp
^
|
| @@ -198,7 +198,7 @@
}
if (rc != sizeof(header_)) {
- DL_ERR("\"%s\" is too small to be an ELF executable: only found %zd bytes", name_.c_str(),
+ DL_ERR("\"%s\" is too small to be an ELF executable: only found %zu bytes", name_.c_str(),
static_cast<size_t>(rc));
return false;
}
@@ -314,7 +314,7 @@
// Like the kernel, we only accept program header tables that
// are smaller than 64KiB.
if (phdr_num_ < 1 || phdr_num_ > 65536/sizeof(ElfW(Phdr))) {
- DL_ERR("\"%s\" has invalid e_phnum: %zd", name_.c_str(), phdr_num_);
+ DL_ERR("\"%s\" has invalid e_phnum: %zu", name_.c_str(), phdr_num_);
return false;
}
@@ -586,18 +586,18 @@
if (load_size_ > reserved_size) {
if (!reserved_hint) {
- DL_ERR("reserved address space %zd smaller than %zd bytes needed for \"%s\"",
+ DL_ERR("reserved address space %zu smaller than %zu bytes needed for \"%s\"",
reserved_size - load_size_, load_size_, name_.c_str());
return false;
}
start = ReserveAligned(mmap_hint, load_size_, kLibraryAlignment);
if (start == nullptr) {
- DL_ERR("couldn't reserve %zd bytes of address space for \"%s\"", load_size_, name_.c_str());
+ DL_ERR("couldn't reserve %zu bytes of address space for \"%s\"", load_size_, name_.c_str());
return false;
}
if (strict_hint && (start != mmap_hint)) {
munmap(start, load_size_);
- DL_ERR("couldn't reserve %zd bytes of address space at %p for \"%s\"",
+ DL_ERR("couldn't reserve %zu bytes of address space at %p for \"%s\"",
load_size_, mmap_hint, name_.c_str());
return false;
}
@@ -668,7 +668,7 @@
fd_,
file_offset_ + file_page_start);
if (seg_addr == MAP_FAILED) {
- DL_ERR("couldn't map \"%s\" segment %zd: %s", name_.c_str(), i, strerror(errno));
+ DL_ERR("couldn't map \"%s\" segment %zu: %s", name_.c_str(), i, strerror(errno));
return false;
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/hybris/common/o/linker_soinfo.cpp
^
|
| @@ -232,7 +232,7 @@
check_symbol_version(verneed, verdef) &&
strcmp(get_string(s->st_name), symbol_name.get_name()) == 0 &&
is_symbol_global_and_defined(this, s)) {
- TRACE_TYPE(LOOKUP, "FOUND %s in %s (%p) %zd",
+ TRACE_TYPE(LOOKUP, "FOUND %s in %s (%p) %zu",
symbol_name.get_name(), get_realpath(), reinterpret_cast<void*>(s->st_value),
static_cast<size_t>(s->st_size));
*symbol_index = n;
@@ -251,7 +251,7 @@
uint32_t* symbol_index) const {
uint32_t hash = symbol_name.elf_hash();
- TRACE_TYPE(LOOKUP, "SEARCH %s in %s@%p h=%x(elf) %zd",
+ TRACE_TYPE(LOOKUP, "SEARCH %s in %s@%p h=%x(elf) %zu",
symbol_name.get_name(), get_realpath(),
reinterpret_cast<void*>(base), hash, hash % nbucket_);
@@ -272,7 +272,7 @@
if (check_symbol_version(verneed, verdef) &&
strcmp(get_string(s->st_name), symbol_name.get_name()) == 0 &&
is_symbol_global_and_defined(this, s)) {
- TRACE_TYPE(LOOKUP, "FOUND %s in %s (%p) %zd",
+ TRACE_TYPE(LOOKUP, "FOUND %s in %s (%p) %zu",
symbol_name.get_name(), get_realpath(),
reinterpret_cast<void*>(s->st_value),
static_cast<size_t>(s->st_size));
@@ -281,7 +281,7 @@
}
}
- TRACE_TYPE(LOOKUP, "NOT FOUND %s in %s@%p %x %zd",
+ TRACE_TYPE(LOOKUP, "NOT FOUND %s in %s@%p %x %zu",
symbol_name.get_name(), get_realpath(),
reinterpret_cast<void*>(base), hash, hash % nbucket_);
@@ -372,7 +372,7 @@
return;
}
- TRACE("[ Calling %s (size %zd) @ %p for '%s' ]", array_name, count, functions, realpath);
+ TRACE("[ Calling %s (size %zu) @ %p for '%s' ]", array_name, count, functions, realpath);
int begin = reverse ? (count - 1) : 0;
int end = reverse ? -1 : count;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/hybris/configure.ac
^
|
| @@ -176,6 +176,7 @@
AM_CONDITIONAL([HAS_HWCOMPOSER2_HEADERS], [false])
AM_CONDITIONAL([HAS_GRALLOC1_HEADER], [false])
AM_CONDITIONAL([HAS_VIBRATOR_HEADER], [false])
+ AC_SUBST([ANDROID_HEADERS_PKGCONFIG], [android-headers])
]
)
CPPFLAGS="$CPPFLAGS $ANDROID_HEADERS_CFLAGS"
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/hybris/egl/platforms/common/hybris-egl-platform.pc.in
^
|
| @@ -6,7 +6,7 @@
Name: hybris-egl-platform
Description: libhybris EGL platform library
Version: @VERSION@
-Requires: android-headers
+Requires: @ANDROID_HEADERS_PKGCONFIG@
Libs: -L${libdir} -lhybris-common -lhybris-eglplatformcommon
-Cflags: -I${includedir} -I${includedir}/hybris/eglplatformcommon
+Cflags: -I${includedir} -I${includedir}/hybris/eglplatformcommon @ANDROID_HEADERS_CFLAGS@
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/hybris/egl/platforms/hwcomposer/hwcomposer_window.cpp
^
|
| @@ -493,7 +493,7 @@
if (b->status) {
b->common.decRef(&b->common);
- fprintf(stderr,"WARNING: %s: allocated only %d buffers out of %d\n", __PRETTY_FUNCTION__, m_bufList.size(), m_bufferCount);
+ fprintf(stderr,"WARNING: %s: allocated only %zu buffers out of %u\n", __PRETTY_FUNCTION__, m_bufList.size(), m_bufferCount);
break;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/hybris/gralloc/libgralloc.pc.in
^
|
| @@ -6,6 +6,6 @@
Name: hybris-gralloc
Description: libhybris gralloc library
Version: @VERSION@
-Requires: android-headers
+Requires: @ANDROID_HEADERS_PKGCONFIG@
Libs: -L${libdir} -lgralloc
-Cflags: -I${includedir}
+Cflags: -I${includedir} @ANDROID_HEADERS_CFLAGS@
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/hybris/hardware/libhardware.pc.in
^
|
| @@ -6,6 +6,6 @@
Name: hybris-hardware
Description: libhybris hardware library
Version: @VERSION@
-Requires: android-headers
+Requires: @ANDROID_HEADERS_PKGCONFIG@
Libs: -L${libdir} -lhardware
-Cflags: -I${includedir}
+Cflags: -I${includedir} @ANDROID_HEADERS_CFLAGS@
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/hybris/libsync/sync_test.c
^
|
| @@ -60,7 +60,7 @@
pt_info->driver_name, pt_info->status,
ts_sec, ts_usec);
if (!strcmp(pt_info->driver_name, "sw_sync"))
- printf(" val=%d\n", *(uint32_t *)pt_info->driver_data);
+ printf(" val=%u\n", *(uint32_t *)pt_info->driver_data);
else
printf("\n");
}
@@ -94,7 +94,7 @@
sprintf(str, "test_fence%d-%d", i, j);
int fd = sw_sync_fence_create(sync_timeline_fd, str, val);
if (fd < 0) {
- printf("can't create sync pt %d: %s", val, strerror(errno));
+ printf("can't create sync pt %u: %s", val, strerror(errno));
return 1;
}
sync_data[i].fd[j] = fd;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/hybris/tests/test_camera.cpp
^
|
| @@ -118,12 +118,12 @@
void raw_data_cb(void* data, uint32_t data_size, void* context)
{
- printf("%s: %d \n", __PRETTY_FUNCTION__, data_size);
+ printf("%s: %u \n", __PRETTY_FUNCTION__, data_size);
}
void jpeg_data_cb(void* data, uint32_t data_size, void* context)
{
- printf("%s: %d \n", __PRETTY_FUNCTION__, data_size);
+ printf("%s: %u \n", __PRETTY_FUNCTION__, data_size);
char fn[256];
sprintf(fn, "/tmp/shot_%d.jpeg", shot_counter);
@@ -232,7 +232,7 @@
static void global_registry_handler(void *data, struct wl_registry *registry, uint32_t id, const char *interface, uint32_t version)
{
- printf("Got a registry event for %s id %d\n", interface, id);
+ printf("Got a registry event for %s id %u\n", interface, id);
if (strcmp(interface, "wl_compositor") == 0) {
wlcompositor = (wl_compositor *)wl_registry_bind(registry,
id,
@@ -246,7 +246,7 @@
static void global_registry_remover(void *data, struct wl_registry *registry, uint32_t id)
{
- printf("Got a registry losing event for %d\n", id);
+ printf("Got a registry losing event for %u\n", id);
}
static const struct wl_registry_listener registry_listener = {
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/hybris/tests/test_recorder.cpp
^
|
| @@ -79,12 +79,12 @@
void raw_data_cb(void* data, uint32_t data_size, void* context)
{
- printf("%s: %d \n", __PRETTY_FUNCTION__, data_size);
+ printf("%s: %u \n", __PRETTY_FUNCTION__, data_size);
}
void jpeg_data_cb(void* data, uint32_t data_size, void* context)
{
- printf("%s: %d \n", __PRETTY_FUNCTION__, data_size);
+ printf("%s: %u \n", __PRETTY_FUNCTION__, data_size);
struct CameraControl* cc = (struct CameraControl*) context;
android_camera_start_preview(cc);
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/utils/generate_glesv1/generate_wrappers.py
^
|
| @@ -31,7 +31,6 @@
#
import re
-import os
import sys
funcs = []
@@ -45,7 +44,6 @@
'GLfixed eqn[4]': 'GLfixed[4]',
'GLfixed mantissa[16]': 'GLfixed[16]',
'GLint exponent[16]': 'GLint[16]',
- 'GLfloat eqn[4]': 'GLfloat[4]',
'GLvoid **': 'GLvoid **',
'GLfloat *': 'GLfloat *',
'GLfixed *': 'GLfixed *',
|
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.37.tar.bz2/libhybris/utils/travis-build.sh
^
|
| @@ -2,7 +2,7 @@
run_first_stage() {
docker pull ubuntu:16.04
- docker run -i -t -v $PWD:/libhybris ubuntu:16.04 /libhybris/utils/travis-build.sh --second-stage
+ docker run -i -t -v "$PWD":/libhybris ubuntu:16.04 /libhybris/utils/travis-build.sh --second-stage
}
run_second_stage() {
|
