aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2021-02-10 19:30:25 +0100
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2021-02-10 21:02:54 +0100
commitf9f8211f9db28ec6385d55ba57bbb023e5ae81e0 (patch)
tree5233b30278a4e4e8aae1dd08839cf86849d607d0
parent9cccc5910ad74154f36cff349f96f7aa3a2e8b62 (diff)
downloadhardware_replicant_libsamsung-ipc-f9f8211f9db28ec6385d55ba57bbb023e5ae81e0.tar.gz
hardware_replicant_libsamsung-ipc-f9f8211f9db28ec6385d55ba57bbb023e5ae81e0.tar.bz2
hardware_replicant_libsamsung-ipc-f9f8211f9db28ec6385d55ba57bbb023e5ae81e0.zip
tools: nv_data-imei: Fix return-type compilation errors on Replicant 6.0
In Replicant 6.0 we have: hardware/replicant/libsamsung-ipc/tools/nv_data-imei.c: In function 'main': hardware/replicant/libsamsung-ipc/tools/nv_data-imei.c:1064:1: error: control reaches end of non-void function [-Werror=return-type] In nv_data-imei's main we had: int main(int argc, char * const argv[]) { [...] assert(false); } and for some reasons the Replicant 6.0 toolchain[1] doesn't recognize that adding a 'return 0;' won't change anything, however doing that is harmless and fixes that compilation error. This issue also affected errno_to_sysexit in the same way: hardware/replicant/libsamsung-ipc/tools/nv_data-imei.c: In function 'errno_to_sysexit': hardware/replicant/libsamsung-ipc/tools/nv_data-imei.c:837:1: error: control reaches end of non-void function [-Werror=return-type] [1] The compiler used (which is built by vendor/replicant/build-toolchain) returns the following when run with --version: arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease) Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r--tools/nv_data-imei.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/nv_data-imei.c b/tools/nv_data-imei.c
index 5ba2a05..3ed335f 100644
--- a/tools/nv_data-imei.c
+++ b/tools/nv_data-imei.c
@@ -834,6 +834,8 @@ static int errno_to_sysexit(int err)
err);
assert(false);
}
+
+ return 0;
}
int main(int argc, char * const argv[])
@@ -1061,4 +1063,6 @@ int main(int argc, char * const argv[])
}
assert(false);
+
+ return 0;
}