- g_assert(s);
-
- for (p = s; *p; p++)
- if (!isdigit(*p))
- e = p+1;
-
- if (e && *e)
- n = atoi(e)+1;
- else
- n = 2;
-
- c = e ? g_strndup(s, e-s) : g_strdup(s);
- r = g_strdup_printf("%s%i", c, n);
- g_free(c);
+ assert(s);
+
+ e = strrchr(s, '-');
+
+ if (e) {
+ const char *p;
+
+ for (p = e+1; *p; p++)
+ if (!isdigit(*p)) {
+ e = NULL;
+ break;
+ }
+
+ if (e && (*(e+1) == '0' || (*(e+1) == 0)))
+ e = NULL;
+ }
+
+ if (e) {
+ char *c;
+
+ e++;
+
+ if (!(c = avahi_strndup(s, e-s)))
+ return NULL;
+
+ r = avahi_strdup_printf("%s%i", c, atoi(e)+1);
+ avahi_free(c);
+
+ } else
+ r = avahi_strdup_printf("%s-2", s);