Cosmetic changes to netd client files.
+ Name the dispatch header correctly (NetdClientDispatch.h).
+ Hide the global dispatch variable (__netdClientDispatch).
+ Explain why it's okay to read the variable without locking.
+ Use quotes instead of angle-brackets for non-system includes.
+ Add necessary declarations for C compiles (and not just C++).
Change-Id: Id0932165e71d81da5fce77a684f40c2263f58e61
diff --git a/libc/private/NetdClient.h b/libc/private/NetdClientDispatch.h
similarity index 65%
rename from libc/private/NetdClient.h
rename to libc/private/NetdClientDispatch.h
index b2ce7a6..0390bfb 100644
--- a/libc/private/NetdClient.h
+++ b/libc/private/NetdClientDispatch.h
@@ -14,16 +14,21 @@
* limitations under the License.
*/
-#ifndef PRIVATE_NETD_CLIENT_H
-#define PRIVATE_NETD_CLIENT_H
+#ifndef PRIVATE_NETD_CLIENT_DISPATCH_H
+#define PRIVATE_NETD_CLIENT_DISPATCH_H
+#include <sys/cdefs.h>
#include <sys/socket.h>
+__BEGIN_DECLS
+
struct NetdClientDispatch {
- int (*accept)(int, sockaddr*, socklen_t*);
- int (*connect)(int, const sockaddr*, socklen_t);
+ int (*accept)(int, struct sockaddr*, socklen_t*);
+ int (*connect)(int, const struct sockaddr*, socklen_t);
};
-extern NetdClientDispatch __netdClientDispatch;
+extern __LIBC_HIDDEN__ struct NetdClientDispatch __netdClientDispatch;
-#endif // PRIVATE_NETD_CLIENT_H
+__END_DECLS
+
+#endif // PRIVATE_NETD_CLIENT_DISPATCH_H