mleku/libblkmaker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix_capnames_sz'

Browse Source 
Conflicts:
	blktemplate.c
This commit is contained in:
Luke Dashjr
2012-10-12 16:24:07 +00:00
parent 1309a4a604 e3022229be
commit cfad7f4bfe
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
blktemplate.c
View File

@@ -36,14 +36,14 @@ static const char *capnames[] = {
}; };
const char *blktmpl_capabilityname(gbt_capabilities_t caps) { const char *blktmpl_capabilityname(gbt_capabilities_t caps) {
for (unsigned int i = 0; i < sizeof(capnames); ++i) for (unsigned int i = 0; i < GBT_CAPABILITY_COUNT; ++i)
if (caps & (1 << i)) if (caps & (1 << i))
return capnames[i]; return capnames[i];
return NULL; return NULL;
} }
gbt_capabilities_t blktmpl_getcapability(const char *n) { gbt_capabilities_t blktmpl_getcapability(const char *n) {
for (unsigned int i = 0; i < sizeof(capnames); ++i) for (unsigned int i = 0; i < GBT_CAPABILITY_COUNT; ++i)
if (capnames[i] && !strcasecmp(n, capnames[i])) if (capnames[i] && !strcasecmp(n, capnames[i]))
return 1 << i; return 1 << i;
return 0; return 0;