#include <talloc/talloc.h>
#include <log/log.h>
-#include "ui/common/discover-client.h"
+#include "discover-client.h"
#include "pb-protocol/pb-protocol.h"
struct discover_client {
client->ops.cb_arg = cb_arg;
client->fd = socket(AF_UNIX, SOCK_STREAM, 0);
- if (!client->fd < 0) {
+ if (client->fd < 0) {
pb_log("%s: socket: %s\n", __func__, strerror(errno));
goto out_err;
}
talloc_free(client);
}
-static void add_device(struct discover_client *client, struct device *device)
+static void device_add(struct discover_client *client, struct device *device)
{
client->n_devices++;
client->devices = talloc_realloc(client, client->devices,
client->devices[client->n_devices - 1] = device;
talloc_steal(client, device);
- client->ops.add_device(device, client->ops.cb_arg);
+ client->ops.device_add(device, client->ops.cb_arg);
}
-static void remove_device(struct discover_client *client, const char *id)
+static void device_remove(struct discover_client *client, const char *id)
{
struct device *device = NULL;
int i;
/* remove the device from the client's device array */
client->n_devices--;
memmove(&client->devices[i], &client->devices[i+1],
- client->n_devices - i);
+ (client->n_devices - i) * sizeof(client->devices[0]));
client->devices = talloc_realloc(client, client->devices,
struct device *, client->n_devices);
/* notify the UI */
- client->ops.remove_device(device, client->ops.cb_arg);
+ client->ops.device_remove(device, client->ops.cb_arg);
talloc_free(device);
}
return 0;
}
- add_device(client, dev);
+ device_add(client, dev);
break;
case PB_PROTOCOL_ACTION_REMOVE:
dev_id = pb_protocol_deserialise_string(client, message);
pb_log("%s: no device id?\n", __func__);
return 0;
}
- remove_device(client, dev_id);
+ device_remove(client, dev_id);
break;
default:
pb_log("%s: unknown action %d\n", __func__, message->action);