OSDN Git Service

bluedroid: compile error hammerhead-userdebug_clang
authorMark Salyzyn <salyzyn@google.com>
Thu, 16 Apr 2015 18:13:39 +0000 (11:13 -0700)
committerMark Salyzyn <salyzyn@google.com>
Thu, 16 Apr 2015 19:49:33 +0000 (12:49 -0700)
- This was a clang complaint, not a gcc complaint
- memset event to be portable to all compile environments
- error as follows:

external/bluetooth/bluedroid/osi/./src/reactor.c:90:34:
    error: missing field data initializer [-Werror,-Wmissing-field-initializers]
  struct epoll_event event = { 0 };
                                 ^
external/bluetooth/bluedroid/osi/./src/reactor.c:151:34:
    error: missing field data initializer [-Werror,-Wmissing-field-initializers]
  struct epoll_event event = { 0 };
                                 ^
external/bluetooth/bluedroid/osi/./src/reactor.c:174:34:
    error: missing field data initializer [-Werror,-Wmissing-field-initializers]
  struct epoll_event event = { 0 };
                                 ^
3 errors generated.
make: *** [out/target/product/hammerhead/obj/STATIC_LIBRARIES/libosi_intermediates/./src/reactor.o] Error 1

Change-Id: I14b884cf1665c68aff1e5afd3df65ac10af474d2

osi/src/reactor.c

index 18f749c..08b5098 100644 (file)
@@ -87,7 +87,8 @@ reactor_t *reactor_new(void) {
     goto error;
   }
 
-  struct epoll_event event = { 0 };
+  struct epoll_event event;
+  memset(&event, 0, sizeof(event));
   event.events = EPOLLIN;
   event.data.ptr = NULL;
   if (epoll_ctl(ret->epoll_fd, EPOLL_CTL_ADD, ret->event_fd, &event) == -1) {
@@ -148,8 +149,8 @@ reactor_object_t *reactor_register(reactor_t *reactor,
   object->write_ready = write_ready;
   pthread_mutex_init(&object->lock, NULL);
 
-  struct epoll_event event = { 0 };
-  event.events = 0;
+  struct epoll_event event;
+  memset(&event, 0, sizeof(event));
   if (read_ready)
     event.events |= (EPOLLIN | EPOLLRDHUP);
   if (write_ready)
@@ -171,8 +172,8 @@ bool reactor_change_registration(reactor_object_t *object,
     void (*write_ready)(void *context)) {
   assert(object != NULL);
 
-  struct epoll_event event = { 0 };
-  event.events = 0;
+  struct epoll_event event;
+  memset(&event, 0, sizeof(event));
   if (read_ready)
     event.events |= (EPOLLIN | EPOLLRDHUP);
   if (write_ready)