From 847d9635980d2343a47bf31519055fb2bbdddc32 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Wed, 18 May 2016 14:22:15 -0700
Subject: [PATCH] Remove a dead header (<netutils/dhcp.h>).
9c07eb9dd83a4b62a24836cc82a0ab5e7ae08f7d removed the implementation, but
missed the header file.
Bug: http://b/27192644
Change-Id: I809a3eb0081b05783b70dbca0274cdde6b1b31a6
---
include/netutils/dhcp.h | 44 -----------------------------------------
libnetutils/dhcptool.c | 3 ++-
2 files changed, 2 insertions(+), 45 deletions(-)
delete mode 100644 include/netutils/dhcp.h
diff --git a/include/netutils/dhcp.h b/include/netutils/dhcp.h
deleted file mode 100644
index 008dbd8871..0000000000
--- a/include/netutils/dhcp.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2010, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _NETUTILS_DHCP_H_
-#define _NETUTILS_DHCP_H_
-
-#include <sys/cdefs.h>
-#include <arpa/inet.h>
-
-__BEGIN_DECLS
-
-extern int do_dhcp(char *iname);
-extern int dhcp_start(const char *ifname);
-extern int dhcp_start_renew(const char *ifname);
-extern int dhcp_get_results(const char *ifname,
- char *ipaddr,
- char *gateway,
- uint32_t *prefixLength,
- char *dns[],
- char *server,
- uint32_t *lease,
- char *vendorInfo,
- char *domain,
- char *mtu);
-extern int dhcp_stop(const char *ifname);
-extern int dhcp_release_lease(const char *ifname);
-extern char *dhcp_get_errmsg();
-
-__END_DECLS
-
-#endif /* _NETUTILS_DHCP_H_ */
diff --git a/libnetutils/dhcptool.c b/libnetutils/dhcptool.c
index a2d3869b4b..d23afd3bd1 100644
--- a/libnetutils/dhcptool.c
+++ b/libnetutils/dhcptool.c
@@ -20,9 +20,10 @@
#include <stdbool.h>
#include <stdlib.h>
-#include <netutils/dhcp.h>
#include <netutils/ifc.h>
+extern int do_dhcp(char*);
+
int main(int argc, char* argv[]) {
if (argc != 2) {
error(EXIT_FAILURE, 0, "usage: %s INTERFACE", argv[0]);
--
GitLab