Solve #16 Multiple Identical Capabilities

Jan Breuer

2015-04-25 94ccbc305cac38eb9c54384b9f47d3da6527299b

 libscpi/src/units.c

@@ -37,7 +37,8 @@
#include <string.h>
#include "scpi/parser.h"
#include "scpi/units.h"
#include "utils.h"
#include "scpi/utils_private.h"
#include "scpi/utils.h"
#include "scpi/error.h"


@@ -109,8 +110,9 @@
    {/* name */ "UP",           /* type */ SCPI_NUM_UP},
    {/* name */ "DOWN",         /* type */ SCPI_NUM_DOWN},
    {/* name */ "NAN",          /* type */ SCPI_NUM_NAN},
    {/* name */ "INF",          /* type */ SCPI_NUM_INF},
    {/* name */ "INFinity",     /* type */ SCPI_NUM_INF},
    {/* name */ "NINF",         /* type */ SCPI_NUM_NINF},
    {/* name */ "AUTO",         /* type */ SCPI_NUM_AUTO},
    SCPI_SPECIAL_NUMBERS_LIST_END,
};

@@ -134,7 +136,7 @@
    }

    for (i = 0; specs[i].name != NULL; i++) {
        if (matchPattern(specs[i].name, strlen(specs[i].name), str, len)) {
        if (matchPattern(specs[i].name, strlen(specs[i].name), str, len, NULL)) {
            value->type = specs[i].type;
            return TRUE;
        }
@@ -311,7 +313,7 @@
        return min(strlen(type), len);
    }

    result = doubleToStr(value->value, str, len);
    result = SCPI_DoubleToStr(value->value, str, len);

    unit = translateUnitInverse(context->units, value->unit);