From 42e45fba4a766748cd81d8b5488add812b120c27 Mon Sep 17 00:00:00 2001
From: Claudio Takahasi <claudio.takahasi@openbossa.org>
Date: Tue, 2 Sep 2008 17:37:12 -0300
Subject: Input cleanup: unused functions

---
 input/storage.c | 89 ---------------------------------------------------------
 input/storage.h |  4 ---
 2 files changed, 93 deletions(-)

(limited to 'input')

diff --git a/input/storage.c b/input/storage.c
index 25894a5b..680033ee 100644
--- a/input/storage.c
+++ b/input/storage.c
@@ -27,15 +27,9 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <ctype.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <stdlib.h>
-#include <sys/file.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <sys/ioctl.h>
-#include <sys/socket.h>
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hidp.h>
@@ -59,48 +53,6 @@ static inline int create_filename(char *buf, size_t size,
 	return create_name(buf, size, STORAGEDIR, addr, name);
 }
 
-int parse_stored_hidd(const char *str, struct hidp_connadd_req *req)
-{
-	char tmp[3];
-	char *desc;
-	unsigned int vendor, product, version, subclass, country, parser, pos;
-	int i;
-
-	desc = malloc(4096);
-	if (!desc)
-		return -ENOMEM;
-
-	memset(desc, 0, 4096);
-
-	sscanf(str, "%04X:%04X:%04X %02X %02X %04X %4095s %08X %n",
-			&vendor, &product, &version, &subclass, &country,
-			&parser, desc, &req->flags, &pos);
-
-	req->vendor   = vendor;
-	req->product  = product;
-	req->version  = version;
-	req->subclass = subclass;
-	req->country  = country;
-	req->parser   = parser;
-
-	req->rd_size = strlen(desc) / 2;
-	req->rd_data = g_try_malloc0(req->rd_size);
-	if (!req->rd_data) {
-		g_free(desc);
-		return -ENOMEM;
-	}
-
-	memset(tmp, 0, sizeof(tmp));
-	for (i = 0; i < req->rd_size; i++) {
-		memcpy(tmp, desc + (i * 2), 2);
-		req->rd_data[i] = (uint8_t) strtol(tmp, NULL, 16);
-	}
-
-	g_free(desc);
-
-	return 0;
-}
-
 int parse_stored_device_info(const char *str, struct hidp_connadd_req *req)
 {
 	char tmp[3];
@@ -246,29 +198,6 @@ int read_device_name(bdaddr_t *src, bdaddr_t *dst, char **name)
 	return 0;
 }
 
-int read_device_class(bdaddr_t *src, bdaddr_t *dst, uint32_t *cls)
-{
-	char filename[PATH_MAX + 1], *str;
-	char addr[18];
-
-	ba2str(src, addr);
-	create_name(filename, PATH_MAX, STORAGEDIR, addr, "classes");
-
-	ba2str(dst, addr);
-	str = textfile_get(filename, addr);
-	if (!str)
-		return -ENOENT;
-
-	if (sscanf(str, "%x", cls) != 1) {
-		g_free(str);
-		return -ENOENT;
-	}
-
-	g_free(str);
-
-	return 0;
-}
-
 int encrypt_link(bdaddr_t *src, bdaddr_t *dst)
 {
 	char filename[PATH_MAX + 1];
@@ -344,21 +273,3 @@ fail:
 
 	return -err;
 }
-
-gboolean has_bonding(bdaddr_t *src, bdaddr_t *dst)
-{
-	char filename[PATH_MAX + 1];
-	char addr[18], *str;
-
-	create_filename(filename, PATH_MAX, src, "linkkeys");
-
-	ba2str(dst, addr);
-
-	str = textfile_get(filename, addr);
-	if (!str)
-		return FALSE;
-
-	free(str);
-
-	return TRUE;
-}
diff --git a/input/storage.h b/input/storage.h
index 90ba4a87..0d1f2d6f 100644
--- a/input/storage.h
+++ b/input/storage.h
@@ -29,13 +29,9 @@ int del_stored_device_info(bdaddr_t *src, bdaddr_t *dst);
 int store_device_info(bdaddr_t *src, bdaddr_t *dst,
 				struct hidp_connadd_req *req);
 
-int parse_stored_hidd(const char *str, struct hidp_connadd_req *req);
 int parse_stored_device_info(const char *str,
 				struct hidp_connadd_req *req);
 
 int read_device_name(bdaddr_t *src, bdaddr_t *dst, char **name);
-int read_device_class(bdaddr_t *src, bdaddr_t *dst, uint32_t *cls);
 
 int encrypt_link(bdaddr_t *src, bdaddr_t *dst);
-
-gboolean has_bonding(bdaddr_t *src, bdaddr_t *dst);
-- 
cgit