use bmk-core instead of stdio

diff --git a/platform/xen/xen/blkfront.c b/platform/xen/xen/blkfront.c
index 80773e18c078f88de4de9f24282dfb3743a885a2..e72d5803c84323a80e10428005c9834d1d415891 100644 (file)
--- a/platform/xen/xen/blkfront.c
+++ b/platform/xen/xen/blkfront.c
@@ -14,9 +14,9 @@
 
 #include <bmk-core/errno.h>
 #include <bmk-core/memalloc.h>
+#include <bmk-core/printf.h>
 
 #include <string.h>
-#include <stdio.h>
 
 #include <stdlib.h> /* XXX: strtoul() */
 
@@ -89,7 +89,7 @@ struct blkfront_dev *blkfront_init(char *_nodename, struct blkfront_info *info)
     dev = bmk_memcalloc(1, sizeof(*dev));
     dev->nodename = strdup(nodename);
 
-    snprintf(path, sizeof(path), "%s/backend-id", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/backend-id", nodename);
     dev->dom = xenbus_read_integer(path); 
     minios_evtchn_alloc_unbound(dev->dom, blkfront_handler, dev, &dev->evtchn);
 
@@ -130,7 +130,7 @@ again:
         goto abort_transaction;
     }
 
-    snprintf(path, sizeof(path), "%s/state", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/state", nodename);
     err = xenbus_switch_state(xbt, path, XenbusStateConnected);
     if (err) {
         message = "switching state";
@@ -155,7 +155,7 @@ abort_transaction:
 
 done:
 
-    snprintf(path, sizeof(path), "%s/backend", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/backend", nodename);
     msg = xenbus_read(XBT_NIL, path, &dev->backend);
     if (msg) {
         minios_printk("Error %s when reading the backend path %s\n", msg, path);
@@ -169,7 +169,7 @@ done:
     {
         XenbusState state;
         char path[strlen(dev->backend) + 1 + 19 + 1];
-        snprintf(path, sizeof(path), "%s/mode", dev->backend);
+        bmk_snprintf(path, sizeof(path), "%s/mode", dev->backend);
         msg = xenbus_read(XBT_NIL, path, &c);
         if (msg) {
             minios_printk("Error %s when reading the mode\n", msg);
@@ -181,7 +181,7 @@ done:
             dev->info.mode = BLKFRONT_RDONLY;
         bmk_memfree(c);
 
-        snprintf(path, sizeof(path), "%s/state", dev->backend);
+        bmk_snprintf(path, sizeof(path), "%s/state", dev->backend);
 
         xenbus_watch_path_token(XBT_NIL, path, path, &dev->events);
 
@@ -195,20 +195,20 @@ done:
             goto error;
         }
 
-        snprintf(path, sizeof(path), "%s/info", dev->backend);
+        bmk_snprintf(path, sizeof(path), "%s/info", dev->backend);
         dev->info.info = xenbus_read_integer(path);
 
-        snprintf(path, sizeof(path), "%s/sectors", dev->backend);
+        bmk_snprintf(path, sizeof(path), "%s/sectors", dev->backend);
         // FIXME: read_integer returns an int, so disk size limited to 1TB for now
         dev->info.sectors = xenbus_read_integer(path);
 
-        snprintf(path, sizeof(path), "%s/sector-size", dev->backend);
+        bmk_snprintf(path, sizeof(path), "%s/sector-size", dev->backend);
         dev->info.sector_size = xenbus_read_integer(path);
 
-        snprintf(path, sizeof(path), "%s/feature-barrier", dev->backend);
+        bmk_snprintf(path, sizeof(path), "%s/feature-barrier", dev->backend);
         dev->info.barrier = xenbus_read_integer(path);
 
-        snprintf(path, sizeof(path), "%s/feature-flush-cache", dev->backend);
+        bmk_snprintf(path, sizeof(path), "%s/feature-flush-cache", dev->backend);
         dev->info.flush = xenbus_read_integer(path);
 
         *info = dev->info;
@@ -238,8 +238,8 @@ void blkfront_shutdown(struct blkfront_dev *dev)
 
     minios_printk("blkfront detached: node=%s\n", dev->nodename);
 
-    snprintf(path, sizeof(path), "%s/state", dev->backend);
-    snprintf(nodename, sizeof(nodename), "%s/state", dev->nodename);
+    bmk_snprintf(path, sizeof(path), "%s/state", dev->backend);
+    bmk_snprintf(nodename, sizeof(nodename), "%s/state", dev->nodename);
 
     if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateClosing)) != NULL) {
         minios_printk("shutdown_blkfront: error changing state to %d: %s\n",
@@ -276,9 +276,9 @@ close:
     if (err) bmk_memfree(err);
     xenbus_unwatch_path_token(XBT_NIL, path, path);
 
-    snprintf(path, sizeof(path), "%s/ring-ref", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/ring-ref", nodename);
     xenbus_rm(XBT_NIL, path);
-    snprintf(path, sizeof(path), "%s/event-channel", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/event-channel", nodename);
     xenbus_rm(XBT_NIL, path);
 
     if (!err)

diff --git a/platform/xen/xen/console/xenbus.c b/platform/xen/xen/console/xenbus.c
index c828027fead37a26e8c7401cac4c4cdbc6bf771f..e64d83e82d3ad6f71195d996880899d9d87ec955 100644 (file)
--- a/platform/xen/xen/console/xenbus.c
+++ b/platform/xen/xen/console/xenbus.c
@@ -14,9 +14,9 @@
 #include "console.h"
 
 #include <bmk-core/memalloc.h>
+#include <bmk-core/printf.h>
 #include <bmk-core/string.h>
 
-#include <stdio.h>
 #include <string.h> /* XXX: for strdup */
 
 void free_consfront(struct consfront_dev *dev)
@@ -27,8 +27,8 @@ void free_consfront(struct consfront_dev *dev)
     char path[bmk_strlen(dev->backend) + 1 + 5 + 1];
     char nodename[bmk_strlen(dev->nodename) + 1 + 5 + 1];
 
-    snprintf(path, sizeof(path), "%s/state", dev->backend);
-    snprintf(nodename, sizeof(nodename), "%s/state", dev->nodename);
+    bmk_snprintf(path, sizeof(path), "%s/state", dev->backend);
+    bmk_snprintf(nodename, sizeof(nodename), "%s/state", dev->nodename);
 
     if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateClosing)) != NULL) {
         minios_printk("free_consfront: error changing state to %d: %s\n",
@@ -75,7 +75,7 @@ struct consfront_dev *init_consfront(char *_nodename)
     int res;
 
     if (!_nodename)
-        snprintf(nodename, sizeof(nodename), "device/console/%d", consfrontends);
+        bmk_snprintf(nodename, sizeof(nodename), "device/console/%d", consfrontends);
     else
         bmk_strncpy(nodename, _nodename, sizeof(nodename));
 
@@ -85,7 +85,7 @@ struct consfront_dev *init_consfront(char *_nodename)
     dev = bmk_memcalloc(1, sizeof(*dev));
     dev->nodename = strdup(nodename);
 
-    snprintf(path, sizeof(path), "%s/backend-id", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/backend-id", nodename);
     if ((res = xenbus_read_integer(path)) < 0) 
         return NULL;
     else
@@ -130,7 +130,7 @@ again:
         goto abort_transaction;
     }
 
-    snprintf(path, sizeof(path), "%s/state", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/state", nodename);
     err = xenbus_switch_state(xbt, path, XenbusStateConnected);
     if (err) {
         message = "switching state";
@@ -155,7 +155,7 @@ abort_transaction:
 
 done:
 
-    snprintf(path, sizeof(path), "%s/backend", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/backend", nodename);
     msg = xenbus_read(XBT_NIL, path, &dev->backend);
     if (msg) {
         minios_printk("Error %s when reading the backend path %s\n", msg, path);
@@ -167,7 +167,7 @@ done:
     {
         XenbusState state;
         char path[bmk_strlen(dev->backend) + 1 + 19 + 1];
-        snprintf(path, sizeof(path), "%s/state", dev->backend);
+        bmk_snprintf(path, sizeof(path), "%s/state", dev->backend);
         
        xenbus_watch_path_token(XBT_NIL, path, path, &dev->events);
         msg = NULL;

diff --git a/platform/xen/xen/netfront.c b/platform/xen/xen/netfront.c
index 12a4fe79a28f6eb624d7897e7e7c151347c85466..070f0320b3f1632f542c696494bff5f5ec8fae87 100644 (file)
--- a/platform/xen/xen/netfront.c
+++ b/platform/xen/xen/netfront.c
@@ -16,8 +16,8 @@
 #include <mini-os/semaphore.h>
 
 #include <bmk-core/memalloc.h>
+#include <bmk-core/printf.h>
 
-#include <stdio.h>
 #include <string.h>
 
 #include <stdlib.h> /* XXX: strtoul() */
@@ -254,7 +254,7 @@ struct netfront_dev *netfront_init(char *_nodename, void (*thenetif_rx)(struct n
     static int netfrontends = 0;
 
     if (!_nodename)
-        snprintf(nodename, sizeof(nodename), "device/vif/%d", netfrontends);
+        bmk_snprintf(nodename, sizeof(nodename), "device/vif/%d", netfrontends);
     else
         strncpy(nodename, _nodename, strlen(nodename));
     netfrontends++;
@@ -278,7 +278,7 @@ struct netfront_dev *netfront_init(char *_nodename, void (*thenetif_rx)(struct n
         dev->rx_buffers[i].page = (char*)minios_alloc_page();
     }
 
-    snprintf(path, sizeof(path), "%s/backend-id", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/backend-id", nodename);
     dev->dom = xenbus_read_integer(path);
         minios_evtchn_alloc_unbound(dev->dom, netfront_handler, dev, &dev->evtchn);
 
@@ -340,7 +340,7 @@ again:
         goto abort_transaction;
     }
 
-    snprintf(path, sizeof(path), "%s/state", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/state", nodename);
     err = xenbus_switch_state(xbt, path, XenbusStateConnected);
     if (err) {
         message = "switching state";
@@ -364,9 +364,9 @@ abort_transaction:
 
 done:
 
-    snprintf(path, sizeof(path), "%s/backend", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/backend", nodename);
     msg = xenbus_read(XBT_NIL, path, &dev->backend);
-    snprintf(path, sizeof(path), "%s/mac", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/mac", nodename);
     msg = xenbus_read(XBT_NIL, path, &dev->mac);
 
     if ((dev->backend == NULL) || (dev->mac == NULL)) {
@@ -380,7 +380,7 @@ done:
     {
         XenbusState state;
         char path[strlen(dev->backend) + 1 + 5 + 1];
-        snprintf(path, sizeof(path), "%s/state", dev->backend);
+        bmk_snprintf(path, sizeof(path), "%s/state", dev->backend);
 
         xenbus_watch_path_token(XBT_NIL, path, path, &dev->events);
 
@@ -395,7 +395,7 @@ done:
         }
 
         if (ip) {
-            snprintf(path, sizeof(path), "%s/ip", dev->backend);
+            bmk_snprintf(path, sizeof(path), "%s/ip", dev->backend);
             xenbus_read(XBT_NIL, path, ip);
         }
     }
@@ -438,8 +438,8 @@ void netfront_shutdown(struct netfront_dev *dev)
 
     minios_printk("close network: backend at %s\n",dev->backend);
 
-    snprintf(path, sizeof(path), "%s/state", dev->backend);
-    snprintf(nodename, sizeof(nodename), "%s/state", dev->nodename);
+    bmk_snprintf(path, sizeof(path), "%s/state", dev->backend);
+    bmk_snprintf(nodename, sizeof(nodename), "%s/state", dev->nodename);
 
     if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateClosing)) != NULL) {
         minios_printk("shutdown_netfront: error changing state to %d: %s\n",
@@ -476,13 +476,13 @@ close:
     if (err) bmk_memfree(err);
     xenbus_unwatch_path_token(XBT_NIL, path, path);
 
-    snprintf(path, sizeof(path), "%s/tx-ring-ref", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/tx-ring-ref", nodename);
     xenbus_rm(XBT_NIL, path);
-    snprintf(path, sizeof(path), "%s/rx-ring-ref", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/rx-ring-ref", nodename);
     xenbus_rm(XBT_NIL, path);
-    snprintf(path, sizeof(path), "%s/event-channel", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/event-channel", nodename);
     xenbus_rm(XBT_NIL, path);
-    snprintf(path, sizeof(path), "%s/request-rx-copy", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/request-rx-copy", nodename);
     xenbus_rm(XBT_NIL, path);
 
     if (!err)

diff --git a/platform/xen/xen/pcifront.c b/platform/xen/xen/pcifront.c
index eb73d2140601bec5520dd2bf76b428a9ec345c4b..4f29c8977f05d082255264c7a0b9248d81a3b96d 100644 (file)
--- a/platform/xen/xen/pcifront.c
+++ b/platform/xen/xen/pcifront.c
@@ -11,13 +11,13 @@
 #include <mini-os/pcifront.h>
 #include <mini-os/sched.h>
 
-#include <stdio.h>
 #include <string.h>
 
 #include <stdlib.h> /* XXX: strtoul() */
 
 #include <bmk-core/errno.h>
 #include <bmk-core/memalloc.h>
+#include <bmk-core/printf.h>
 
 #define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07))
 
@@ -70,8 +70,8 @@ void pcifront_watches(void *opaque)
     struct xenbus_event_queue events;
     xenbus_event_queue_init(&events);
 
-    snprintf(path, sizeof(path), "%s/backend", nodename);
-    snprintf(fe_state, sizeof(fe_state), "%s/state", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/backend", nodename);
+    bmk_snprintf(fe_state, sizeof(fe_state), "%s/state", nodename);
 
     while (1) {
         minios_printk("pcifront_watches: waiting for backend path to appear %s\n", path);
@@ -83,7 +83,7 @@ void pcifront_watches(void *opaque)
         xenbus_unwatch_path_token(XBT_NIL, path, path);
         minios_printk("pcifront_watches: waiting for backend to get into the right state %s\n", be_path);
         be_state = (char *) bmk_memalloc(strlen(be_path) +  7, 0);
-        snprintf(be_state, strlen(be_path) +  7, "%s/state", be_path);
+        bmk_snprintf(be_state, strlen(be_path) +  7, "%s/state", be_path);
         xenbus_watch_path_token(XBT_NIL, be_state, be_state, &events);
         while ((err = xenbus_read(XBT_NIL, be_state, &msg)) != NULL || msg[0] > '4') {
             bmk_memfree(msg);
@@ -159,7 +159,7 @@ struct pcifront_dev *init_pcifront(char *_nodename)
     if (!_nodename && pcidev)
         return pcidev;
 
-    snprintf(path, sizeof(path), "%s/backend-id", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/backend-id", nodename);
     dom = xenbus_read_integer(path); 
     if (dom == -1) {
         minios_printk("no backend\n");
@@ -205,7 +205,7 @@ again:
         goto abort_transaction;
     }
 
-    snprintf(path, sizeof(path), "%s/state", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/state", nodename);
     err = xenbus_switch_state(xbt, path, XenbusStateInitialised);
     if (err) {
         message = "switching state";
@@ -229,7 +229,7 @@ abort_transaction:
 
 done:
 
-    snprintf(path, sizeof(path), "%s/backend", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/backend", nodename);
     msg = xenbus_read(XBT_NIL, path, &dev->backend);
     if (msg) {
         minios_printk("Error %s when reading the backend path %s\n", msg, path);
@@ -242,7 +242,7 @@ done:
         char path[strlen(dev->backend) + 1 + 5 + 1];
         char frontpath[strlen(nodename) + 1 + 5 + 1];
         XenbusState state;
-        snprintf(path, sizeof(path), "%s/state", dev->backend);
+        bmk_snprintf(path, sizeof(path), "%s/state", dev->backend);
 
         xenbus_watch_path_token(XBT_NIL, path, path, &dev->events);
 
@@ -256,7 +256,7 @@ done:
             goto error;
         }
 
-        snprintf(frontpath, sizeof(frontpath), "%s/state", nodename);
+        bmk_snprintf(frontpath, sizeof(frontpath), "%s/state", nodename);
         if ((err = xenbus_switch_state(XBT_NIL, frontpath, XenbusStateConnected))
             != NULL) {
             minios_printk("error switching state %s\n", err);
@@ -328,11 +328,11 @@ void pcifront_scan(struct pcifront_dev *dev, void (*func)(unsigned int domain, u
 
     len = strlen(dev->backend) + 1 + 5 + 10 + 1;
     path = (char *) bmk_memalloc(len, 0);
-    snprintf(path, len, "%s/num_devs", dev->backend);
+    bmk_snprintf(path, len, "%s/num_devs", dev->backend);
     n = xenbus_read_integer(path);
 
     for (i = 0; i < n; i++) {
-        snprintf(path, len, "%s/dev-%d", dev->backend, i);
+        bmk_snprintf(path, len, "%s/dev-%d", dev->backend, i);
         msg = xenbus_read(XBT_NIL, path, &s);
         if (msg) {
             minios_printk("Error %s when reading the PCI root name at %s\n", msg, path);
@@ -362,8 +362,8 @@ void shutdown_pcifront(struct pcifront_dev *dev)
 
     minios_printk("close pci: backend at %s\n",dev->backend);
 
-    snprintf(path, sizeof(path), "%s/state", dev->backend);
-    snprintf(nodename, sizeof(nodename), "%s/state", dev->nodename);
+    bmk_snprintf(path, sizeof(path), "%s/state", dev->backend);
+    bmk_snprintf(nodename, sizeof(nodename), "%s/state", dev->nodename);
     if ((err = xenbus_switch_state(XBT_NIL, nodename, XenbusStateClosing)) != NULL) {
         minios_printk("shutdown_pcifront: error changing state to %d: %s\n",
                 XenbusStateClosing, err);
@@ -399,9 +399,9 @@ close_pcifront:
     if (err) bmk_memfree(err);
     xenbus_unwatch_path_token(XBT_NIL, path, path);
 
-    snprintf(path, sizeof(path), "%s/info-ref", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/info-ref", nodename);
     xenbus_rm(XBT_NIL, path);
-    snprintf(path, sizeof(path), "%s/event-channel", nodename);
+    bmk_snprintf(path, sizeof(path), "%s/event-channel", nodename);
     xenbus_rm(XBT_NIL, path);
 
     if (!err)
@@ -423,11 +423,11 @@ int pcifront_physical_to_virtual (struct pcifront_dev *dev,
     if (!dev)
         dev = pcidev;
 
-    snprintf(path, sizeof(path), "%s/num_devs", dev->backend);
+    bmk_snprintf(path, sizeof(path), "%s/num_devs", dev->backend);
     n = xenbus_read_integer(path);
 
     for (i = 0; i < n; i++) {
-        snprintf(path, sizeof(path), "%s/dev-%d", dev->backend, i);
+        bmk_snprintf(path, sizeof(path), "%s/dev-%d", dev->backend, i);
         msg = xenbus_read(XBT_NIL, path, &s);
         if (msg) {
             minios_printk("Error %s when reading the PCI root name at %s\n", msg, path);
@@ -440,7 +440,7 @@ int pcifront_physical_to_virtual (struct pcifront_dev *dev,
             continue;
 
         if (dom1 == *dom && bus1 == *bus && slot1 == *slot && fun1 == *fun) {
-            snprintf(path, sizeof(path), "%s/vdev-%d", dev->backend, i);
+            bmk_snprintf(path, sizeof(path), "%s/vdev-%d", dev->backend, i);
             msg = xenbus_read(XBT_NIL, path, &s);
             if (msg) {
                 minios_printk("Error %s when reading the PCI root name at %s\n", msg, path);

diff --git a/platform/xen/xen/xenbus/xenbus.c b/platform/xen/xen/xenbus/xenbus.c
index 471c21927f8283434d35e9f573fb983377632d85..700ae4d2c630851414f338124701bcb09af23acc 100644 (file)
--- a/platform/xen/xen/xenbus/xenbus.c
+++ b/platform/xen/xen/xenbus/xenbus.c
@@ -30,6 +30,7 @@
 #include <string.h> /* XXX: strdup */
 
 #include <bmk-core/memalloc.h>
+#include <bmk-core/printf.h>
 #include <bmk-core/string.h>
 
 #define min(x,y) ({                       \
@@ -206,7 +207,7 @@ char *xenbus_switch_state(xenbus_transaction_t xbt, const char* path, XenbusStat
             goto exit;
         }
 
-        snprintf(value, 2, "%d", state);
+        bmk_snprintf(value, 2, "%d", state);
         msg = xenbus_write(xbt, path, value);
 
 exit:
@@ -395,7 +396,7 @@ void xenbus_watch_prepare(struct xenbus_watch *watch)
     BUG_ON(!watch->events);
     size_t size = sizeof(void*)*2 + 5;
     watch->token = bmk_memalloc(size, 0);
-    int r = snprintf(watch->token,size,"*%p",(void*)watch);
+    int r = bmk_snprintf(watch->token,size,"*%p",(void*)watch);
     BUG_ON(!(r > 0 && r < size));
     spin_lock(&xenbus_req_lock);
     MINIOS_LIST_INSERT_HEAD(&watches, watch, entry);
@@ -749,7 +750,7 @@ char *xenbus_set_perms(xenbus_transaction_t xbt, const char *path, domid_t dom,
     };
     struct xsd_sockmsg *rep;
     char *msg;
-    snprintf(value, PERM_MAX_SIZE, "%c%hu", perm, dom);
+    bmk_snprintf(value, PERM_MAX_SIZE, "%c%hu", perm, dom);
     req[1].len = bmk_strlen(value) + 1;
     rep = xenbus_msg_reply(XS_SET_PERMS, xbt, req, ARRAY_SIZE(req));
     msg = errmsg(rep);