svn commit: r295260 - head/bin/dd

[Edward Tomasz Napierala]

Author: trasz
Date: Thu Feb  4 15:10:08 2016
New Revision: 295260
URL: https://svnweb.freebsd.org/changeset/base/295260

Log:
  Reduce code duplication.
  
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/bin/dd/args.c

Modified: head/bin/dd/args.c
==============================================================================
--- head/bin/dd/args.c	Thu Feb  4 14:32:48 2016	(r295259)
+++ head/bin/dd/args.c	Thu Feb  4 15:10:08 2016	(r295260)
@@ -360,6 +360,38 @@ c_conv(const void *a, const void *b)
 	    ((const struct conv *)b)->name));
 }
 
+static uintmax_t
+postfix_to_mult(const char expr)
+{
+	uintmax_t mult;
+
+	mult = 0;
+	switch (expr) {
+	case 'B':
+	case 'b':
+		mult = 512;
+		break;
+	case 'K':
+	case 'k':
+		mult = 1 << 10;
+		break;
+	case 'M':
+	case 'm':
+		mult = 1 << 20;
+		break;
+	case 'G':
+	case 'g':
+		mult = 1 << 30;
+		break;
+	case 'W':
+	case 'w':
+		mult = sizeof(int);
+		break;
+	}
+
+	return (mult);
+}
+
 /*
  * Convert an expression of the following forms to a uintmax_t.
  * 	1) A positive decimal number.
@@ -386,31 +418,7 @@ get_num(const char *val)
 	if (expr == val)			/* No valid digits. */
 		errx(1, "%s: illegal numeric value", oper);
 
-	mult = 0;
-	switch (*expr) {
-	case 'B':
-	case 'b':
-		mult = 512;
-		break;
-	case 'K':
-	case 'k':
-		mult = 1 << 10;
-		break;
-	case 'M':
-	case 'm':
-		mult = 1 << 20;
-		break;
-	case 'G':
-	case 'g':
-		mult = 1 << 30;
-		break;
-	case 'W':
-	case 'w':
-		mult = sizeof(int);
-		break;
-	default:
-		;
-	}
+	mult = postfix_to_mult(*expr);
 
 	if (mult != 0) {
 		prevnum = num;
@@ -460,29 +468,7 @@ get_off_t(const char *val)
 	if (expr == val)			/* No valid digits. */
 		errx(1, "%s: illegal numeric value", oper);
 
-	mult = 0;
-	switch (*expr) {
-	case 'B':
-	case 'b':
-		mult = 512;
-		break;
-	case 'K':
-	case 'k':
-		mult = 1 << 10;
-		break;
-	case 'M':
-	case 'm':
-		mult = 1 << 20;
-		break;
-	case 'G':
-	case 'g':
-		mult = 1 << 30;
-		break;
-	case 'W':
-	case 'w':
-		mult = sizeof(int);
-		break;
-	}
+	mult = postfix_to_mult(*expr);
 
 	if (mult != 0) {
 		prevnum = num;