Fix two compile warnings

diff --git a/ChangeLog b/ChangeLog
index beee23d4cd66c0185752165296aab641a692cc2b..d1944ee4750ffbe95f2387240ceaa03b6fea9d51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct  9 15:49:25 BST Daniel P Berrange <berrange@redhat.com>
+
+       * src/lxc_driver.c: Annotate unused parameter
+       * src/virsh.c: Fix scanf format specifier
+
 Wed Oct  8 08:29:25 PDT 2008 Dan Smith <danms@us.ibm.com>
        * src/cgroup.c src/cgroup.h: Add cpu shares manipulation
        * src/lxc_driver.c: Add scheduler parameters interface for cpu shares

diff --git a/src/lxc_driver.c b/src/lxc_driver.c
index 30c3cab06454d8faa442ca117f44489f8122b9d0..6f17fa3e957db81cd6b7d1045af88dc4e58152ae 100644 (file)
--- a/src/lxc_driver.c
+++ b/src/lxc_driver.c
@@ -1145,7 +1145,7 @@ static int lxcVersion(virConnectPtr conn, unsigned long *version)
     return 0;
 }
 
-static char *lxcGetSchedulerType(virDomainPtr domain, int *nparams)
+static char *lxcGetSchedulerType(virDomainPtr domain ATTRIBUTE_UNUSED, int *nparams)
 {
     if (nparams)
         *nparams = 1;

diff --git a/src/virsh.c b/src/virsh.c
index eaed61d75969a93045b0131a616626031f7cda55..313ec6096686dc76a73e1cdbc088899beda5fb6b 100644 (file)
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -1178,7 +1178,7 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd)
         if (param_name == NULL)
             goto cleanup;
 
-        if (sscanf(set, "%[^=]=%i", param_name, &param_value) != 2) {
+        if (sscanf(set, "%[^=]=%lli", param_name, &param_value) != 2) {
             vshError(ctl, FALSE, "%s", _("Invalid value of param"));
             goto cleanup;
         }