ctdb-format.patch

   1 --- ctdb-2.1/ib/ibwrapper.c.orig        2013-01-20 07:41:57.623125096 +0100
   2 +++ ctdb-2.1/ib/ibwrapper.c     2013-01-20 08:05:20.174450630 +0100
   3 @@ -346,7 +346,7 @@
   4         rc = ibv_post_recv(pconn->cm_id->qp, &wr, &bad_wr);
   5         if (rc) {
   6                 sprintf(ibw_lasterr, "refill/ibv_post_recv failed with %d\n", rc);
   7 -               DEBUG(DEBUG_ERR, (ibw_lasterr));
   8 +               DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
   9                 return -2;
  10         }
  11
  12 @@ -380,7 +380,7 @@
  13                 rc = ibv_post_recv(pconn->cm_id->qp, &wr, &bad_wr);
  14                 if (rc) {
  15                         sprintf(ibw_lasterr, "fill/ibv_post_recv failed with %d\n", rc);
  16 -                       DEBUG(DEBUG_ERR, (ibw_lasterr));
  17 +                       DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
  18                         return -2;
  19                 }
  20         }
  21 @@ -657,7 +657,7 @@
  22  error:
  23         ibv_ack_cq_events(pconn->cq, 1);
  24
  25 -       DEBUG(DEBUG_ERR, (ibw_lasterr));
  26 +       DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
  27
  28         if (conn->state!=IBWC_ERROR) {
  29                 conn->state = IBWC_ERROR;
  30 @@ -997,7 +997,7 @@
  31         return ctx;
  32         /* don't put code here */
  33  cleanup:
  34 -       DEBUG(DEBUG_ERR, (ibw_lasterr));
  35 +       DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
  36
  37         if (ctx)
  38                 talloc_free(ctx);
  39 @@ -1035,7 +1035,7 @@
  40         rc = rdma_bind_addr(pctx->cm_id, (struct sockaddr *) my_addr);
  41         if (rc) {
  42                 sprintf(ibw_lasterr, "rdma_bind_addr error %d\n", rc);
  43 -               DEBUG(DEBUG_ERR, (ibw_lasterr));
  44 +               DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
  45                 return rc;
  46         }
  47         DEBUG(DEBUG_DEBUG, ("rdma_bind_addr successful\n"));
  48 @@ -1052,7 +1052,7 @@
  49         rc = rdma_listen(pctx->cm_id, backlog);
  50         if (rc) {
  51                 sprintf(ibw_lasterr, "rdma_listen failed: %d\n", rc);
  52 -               DEBUG(DEBUG_ERR, (ibw_lasterr));
  53 +               DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
  54                 return rc;
  55         }
  56
  57 @@ -1074,7 +1074,7 @@
  58         rc = rdma_accept(pconn->cm_id, &conn_param);
  59         if (rc) {
  60                 sprintf(ibw_lasterr, "rdma_accept failed %d\n", rc);
  61 -               DEBUG(DEBUG_ERR, (ibw_lasterr));
  62 +               DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
  63                 return -1;;
  64         }
  65
  66 @@ -1121,7 +1121,7 @@
  67         rc = rdma_resolve_addr(pconn->cm_id, NULL, (struct sockaddr *) serv_addr, 2000);
  68         if (rc) {
  69                 sprintf(ibw_lasterr, "rdma_resolve_addr error %d\n", rc);
  70 -               DEBUG(DEBUG_ERR, (ibw_lasterr));
  71 +               DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
  72                 talloc_free(conn);
  73                 return -1;
  74         }
  75 @@ -1148,7 +1148,7 @@
  76                 rc = rdma_disconnect(pconn->cm_id);
  77                 if (rc) {
  78                         sprintf(ibw_lasterr, "ibw_disconnect failed with %d\n", rc);
  79 -                       DEBUG(DEBUG_ERR, (ibw_lasterr));
  80 +                       DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
  81                         return rc;
  82                 }
  83                 break;
  84 @@ -1286,7 +1286,7 @@
  85
  86         return 0;
  87  error:
  88 -       DEBUG(DEBUG_ERR, (ibw_lasterr));
  89 +       DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
  90         return -1;
  91  }
  92