changeset 0:9d4b9dc0c1e2 default tip

libcutils patch queue
author Mario Torre <neugens.limasoftware@gmail.com>
date Fri, 25 Feb 2011 00:11:31 +0100
parents
children
files icedrobot/buildfix.patch icedrobot/cmake.patch icedrobot/series icedrobot/status
diffstat 3 files changed, 191 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/icedrobot/buildfix.patch	Fri Feb 25 00:11:31 2011 +0100
@@ -0,0 +1,127 @@
+diff --git a/cpu_info.c b/cpu_info.c
+index 23dda8a..f671869 100644
+--- a/cpu_info.c
++++ b/cpu_info.c
+@@ -31,7 +31,6 @@ extern const char* get_cpu_serial_number(void)
+         FILE* file;
+         char* chp, *end;
+         char* whitespace;
+-        int length;
+         
+         // read serial number from /proc/cpuinfo
+         file = fopen("proc/cpuinfo", "r");
+diff --git a/process_name.c b/process_name.c
+index b235429..bda9d08 100644
+--- a/process_name.c
++++ b/process_name.c
+@@ -14,6 +14,7 @@
+  * limitations under the License.
+  */
+ 
++#include <stdlib.h>
+ #include <string.h>
+ #include <cutils/process_name.h>
+ #include <cutils/properties.h>
+diff --git a/properties.c b/properties.c
+index 547cc6d..8ee820b 100644
+--- a/properties.c
++++ b/properties.c
+@@ -332,7 +332,6 @@ int property_get(const char *key, char *value, const char *default_value)
+ int property_set(const char *key, const char *value)
+ {
+     char ename[PROPERTY_KEY_MAX + 6];
+-    char *p;
+     int len;
+     int r;
+ 
+diff --git a/socket_inaddr_any_server.c b/socket_inaddr_any_server.c
+index 7d5dab4..6732f76 100644
+--- a/socket_inaddr_any_server.c
++++ b/socket_inaddr_any_server.c
+@@ -36,7 +36,6 @@
+ int socket_inaddr_any_server(int port, int type)
+ {
+     struct sockaddr_in addr;
+-    size_t alen;
+     int s, n;
+ 
+     memset(&addr, 0, sizeof(addr));
+diff --git a/socket_local_client.c b/socket_local_client.c
+index 036ce2e..64dac64 100644
+--- a/socket_local_client.c
++++ b/socket_local_client.c
+@@ -122,11 +122,10 @@ error:
+  * Used by AndroidSocketImpl
+  */
+ int socket_local_client_connect(int fd, const char *name, int namespaceId, 
+-        int type)
++        int type __attribute__ ((unused)))
+ {
+     struct sockaddr_un addr;
+     socklen_t alen;
+-    size_t namelen;
+     int err;
+ 
+     err = socket_make_sockaddr_un(name, namespaceId, &addr, &alen);
+diff --git a/socket_loopback_client.c b/socket_loopback_client.c
+index cb82c5e..278dfc4 100644
+--- a/socket_loopback_client.c
++++ b/socket_loopback_client.c
+@@ -37,7 +37,6 @@
+ int socket_loopback_client(int port, int type)
+ {
+     struct sockaddr_in addr;
+-    socklen_t alen;
+     int s;
+ 
+     memset(&addr, 0, sizeof(addr));
+diff --git a/socket_loopback_server.c b/socket_loopback_server.c
+index 3208488..70f511b 100644
+--- a/socket_loopback_server.c
++++ b/socket_loopback_server.c
+@@ -36,7 +36,6 @@
+ int socket_loopback_server(int port, int type)
+ {
+     struct sockaddr_in addr;
+-    size_t alen;
+     int s, n;
+ 
+     memset(&addr, 0, sizeof(addr));
+diff --git a/socket_network_client.c b/socket_network_client.c
+index a64006c..bf7de8e 100644
+--- a/socket_network_client.c
++++ b/socket_network_client.c
+@@ -40,7 +40,6 @@ int socket_network_client(const char *host, int port, int type)
+ {
+     struct hostent *hp;
+     struct sockaddr_in addr;
+-    socklen_t alen;
+     int s;
+ 
+     hp = gethostbyname(host);
+diff --git a/threads.c b/threads.c
+index 42cc928..53366a8 100644
+--- a/threads.c
++++ b/threads.c
+@@ -19,8 +19,6 @@
+ #ifdef HAVE_PTHREADS
+ void*  thread_store_get( thread_store_t*  store )
+ {
+-    const pthread_key_t  k = store->tls;
+-
+     if (!store->has_tls)
+         return NULL;
+ 
+diff --git a/tzstrftime.c b/tzstrftime.c
+index e37d79a..626b4f8 100644
+--- a/tzstrftime.c
++++ b/tzstrftime.c
+@@ -8,6 +8,8 @@ static char	elsieid[] = "@(#)strftime.c	8.1";
+ #endif /* !defined NOID */
+ #endif /* !defined lint */
+ 
++#include <stdio.h>
++
+ #include <time.h>
+ #include <tzfile.h>
+ #include <limits.h>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/icedrobot/cmake.patch	Fri Feb 25 00:11:31 2011 +0100
@@ -0,0 +1,62 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 0000000..589da7c
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,56 @@
++# IcedRobot CMakeList file
++# (C) the IcedRobot team
++# see www.icedrobot.org details and contacts
++
++cmake_minimum_required(VERSION 2.8)
++
++project (libcutils)
++
++include("${CMAKE_SOURCE_DIR}/../../../icedrobot/make/CMakeLists.txt")
++
++# gcc flags
++add_definitions(-std=gnu99)
++
++# include directories
++include_directories (
++"${CMAKE_CURRENT_SOURCE_DIR}/../../../icedrobot/out/include/"
++"${CMAKE_CURRENT_SOURCE_DIR}"
++)
++
++SET(SOURCES
++abort_socket.c
++array.c
++ashmem-host.c
++atomic.c
++buffer.c
++buffer.h
++config_utils.c
++cpu_info.c
++hashmap.c
++iosched_policy.c
++load_file.c
++loghack.h
++native_handle.c
++open_memstream.c
++private.h
++process_name.c
++properties.c
++record_stream.c
++sched_policy.c
++selector.c
++socket_inaddr_any_server.c
++socket_local.h
++socket_local_client.c
++socket_local_server.c
++socket_loopback_client.c
++socket_loopback_server.c
++socket_network_client.c
++strdup16to8.c
++strdup8to16.c
++threads.c
++tzstrftime.c
++tztime.c
++zygote.c
++)
++
++add_library (cutils SHARED ${SOURCES})
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/icedrobot/series	Fri Feb 25 00:11:31 2011 +0100
@@ -0,0 +1,2 @@
+buildfix.patch
+cmake.patch