From 70f2c76ff94a2f108125576986d4353dfd9a357e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 23 Oct 2008 10:21:41 +0100 Subject: [PATCH] Battery management - compilation fixes * xenstore_refresh_battery_status declaration and definition was missing void (interpreted in C as K&R syntax) * a couple of functions returning int returned NULL on failure --- qemu-xen.h | 2 +- xenstore.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qemu-xen.h b/qemu-xen.h index 8704774b2..c9df5bda7 100644 --- a/qemu-xen.h +++ b/qemu-xen.h @@ -87,7 +87,7 @@ int xenstore_vm_write(int domid, char *key, char *val); char *xenstore_vm_read(int domid, char *key, unsigned int *len); char *xenstore_device_model_read(int domid, char *key, unsigned int *len); char *xenstore_read_battery_data(int battery_status); -int xenstore_refresh_battery_status(); +int xenstore_refresh_battery_status(void); /* xenfbfront.c */ int xenfb_pv_display_init(DisplayState *ds); diff --git a/xenstore.c b/xenstore.c index 3b3883765..d064df100 100644 --- a/xenstore.c +++ b/xenstore.c @@ -1190,7 +1190,7 @@ int xenstore_extended_power_mgmt_write(char * key, char * value) char *path = NULL; if (pasprintf(&path, "/pm/%s", key) == -1) - return NULL; + return -1; ret = xs_write(xsh, XBT_NULL, path, value, strlen(value)); free(path); @@ -1203,7 +1203,7 @@ int xenstore_extended_power_mgmt_event_trigger(char *key, char * value) char *path = NULL; if (pasprintf(&path, "events/%s", key) == -1) - return NULL; + return -1; ret = xenstore_extended_power_mgmt_write(path, value); free(path); @@ -1230,7 +1230,7 @@ char *xenstore_read_battery_data(int battery_status) * Xen power management daemon watches for changes to this * entry and triggers a refresh. */ -int xenstore_refresh_battery_status() +int xenstore_refresh_battery_status(void) { return xenstore_extended_power_mgmt_event_trigger("refreshbatterystatus", "1"); } -- 2.39.5