- // we dont have a digit, check for numeric tokens
- switch (tolower(*i))
- {
- case 's':
- total += atoi(n_field);
- break;
-
- case 'm':
- total += (atoi(n_field)*duration_m);
- break;
-
- case 'h':
- total += (atoi(n_field)*duration_h);
- break;
-
- case 'd':
- total += (atoi(n_field)*duration_d);
- break;
-
- case 'w':
- total += (atoi(n_field)*duration_w);
- break;
+ /* Found something thats not a number, find out how much
+ * it multiplies the built up number by, multiply the total
+ * and reset the built up number.
+ */
+ if (subtotal)
+ total += subtotal * duration_multi[multiplier];