diff -r 2eac473ac291 -r 3bd7e7008ac3 sourcemm/CSmmAPI.cpp --- a/sourcemm/CSmmAPI.cpp Mon Aug 14 20:14:02 2006 +0000 +++ b/sourcemm/CSmmAPI.cpp Tue Aug 15 20:10:12 2006 +0000 @@ -357,10 +357,11 @@ return pf; } -void *CSmmAPI::VInterfaceMatch(CreateInterfaceFn fn, const char *iface, bool chop) +void *CSmmAPI::VInterfaceMatch(CreateInterfaceFn fn, const char *iface, int min) { char buffer[256]; /* assume no interface will go beyond this */ int len = static_cast(strlen(iface)); + int ret; /* just in case something doesn't handle NULL properly */ if (len > static_cast(sizeof(buffer) - 4)) { @@ -369,7 +370,7 @@ strcpy(buffer, iface); - if (chop) + if (min != -1) { char *ptr = &buffer[len-1]; int digits = 0; @@ -383,12 +384,15 @@ { /* for now, assume this is an error */ strcpy(buffer, iface); + } else { + char num[4]; + min = (min == 0) ? 1 : min; + snprintf(num, sizeof(num), "%03d", min); + strcat(buffer, num); } } - strcat(buffer, "001"); - - return InterfaceSearch(fn, buffer, IFACE_MAXNUM, NULL); + return InterfaceSearch(fn, buffer, IFACE_MAXNUM, &ret); } const char *CSmmAPI::GetBaseDir()