From f692fddffad9963da5539e72ed71c392bb442aba Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Thu, 11 Aug 2016 07:49:24 +0000 Subject: [PATCH] ABI break: Return uint32_t from blktmpl_getcapability since "time" yields a combination of gbt_capabilities_t --- blktemplate.c | 4 ++-- blktemplate.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/blktemplate.c b/blktemplate.c index cefa928..d19f575 100644 --- a/blktemplate.c +++ b/blktemplate.c @@ -49,10 +49,10 @@ const char *blktmpl_capabilityname(gbt_capabilities_t caps) { return NULL; } -gbt_capabilities_t blktmpl_getcapability(const char *n) { +uint32_t blktmpl_getcapability(const char *n) { for (unsigned int i = 0; i < GBT_CAPABILITY_COUNT; ++i) if (capnames[i] && !strcasecmp(n, capnames[i])) - return 1 << i; + return ((uint32_t)1) << i; if (!strcasecmp(n, "time")) { // multi-capability return BMM_TIMEINC | BMM_TIMEDEC; diff --git a/blktemplate.h b/blktemplate.h index ee90eca..624ad62 100644 --- a/blktemplate.h +++ b/blktemplate.h @@ -89,8 +89,8 @@ typedef enum { extern const char *blktmpl_capabilityname(gbt_capabilities_t); #define BLKTMPL_LONGEST_CAPABILITY_NAME (16) -// ABI FIXME: return uint32_t since "time" can yield a combination gbt_capabilities_t -extern gbt_capabilities_t blktmpl_getcapability(const char *); +// NOTE: blktmpl_getcapability("time") yields a combination of gbt_capabilities_t +extern uint32_t blktmpl_getcapability(const char *); typedef gbt_capabilities_t blkmutations_t;