Index: uspace/app/ping/ping.c
===================================================================
--- uspace/app/ping/ping.c	(revision 88dea9d01a9bc5e8482c1ceafa6e6531ac50cb4f)
+++ uspace/app/ping/ping.c	(revision d8e3467358e76057c47d6b02a28d442a944676e6)
@@ -132,16 +132,4 @@
 }
 
-static int arg_short_long(const char *arg, const char *ashort,
-    const char *along)
-{
-	if (str_cmp(arg, ashort) == 0)
-		return 0;
-	
-	if (str_lcmp(arg, along, str_length(along)) == 0)
-		return str_length(along);
-	
-	return -1;
-}
-
 static int args_parse(int argc, char *argv[], ping_config_t *config)
 {
@@ -165,12 +153,11 @@
 		
 		int off;
-		int tmp;
 		
 		/* Usage */
-		if ((off = arg_short_long(argv[i], "-h", "--help")) != -1)
+		if ((off = arg_parse_short_long(argv[i], "-h", "--help")) != -1)
 			return CL_USAGE;
 		
 		/* Verbose */
-		if ((off = arg_short_long(argv[i], "-v", "--verbose")) != -1) {
+		if ((off = arg_parse_short_long(argv[i], "-v", "--verbose")) != -1) {
 			config->verbose = true;
 			continue;
@@ -184,5 +171,6 @@
 		
 		/* Count */
-		if ((off = arg_short_long(argv[i], "-c", "--count=")) != -1) {
+		if ((off = arg_parse_short_long(argv[i], "-c", "--count=")) != -1) {
+			int tmp;
 			ret = arg_parse_int(argc, argv, &i, &tmp, off);
 			
@@ -195,5 +183,6 @@
 		
 		/* Outgoing packet size */
-		if ((off = arg_short_long(argv[i], "-s", "--size=")) != -1) {
+		if ((off = arg_parse_short_long(argv[i], "-s", "--size=")) != -1) {
+			int tmp;
 			ret = arg_parse_int(argc, argv, &i, &tmp, off);
 			
@@ -206,5 +195,6 @@
 		
 		/* Reply wait timeout */
-		if ((off = arg_short_long(argv[i], "-W", "--timeout=")) != -1) {
+		if ((off = arg_parse_short_long(argv[i], "-W", "--timeout=")) != -1) {
+			int tmp;
 			ret = arg_parse_int(argc, argv, &i, &tmp, off);
 			
@@ -217,5 +207,5 @@
 		
 		/* Address family */
-		if ((off = arg_short_long(argv[i], "-f", "--family=")) != -1) {
+		if ((off = arg_parse_short_long(argv[i], "-f", "--family=")) != -1) {
 			ret = arg_parse_name_int(argc, argv, &i, &config->af, off,
 			    socket_parse_address_family);
@@ -228,5 +218,6 @@
 		
 		/* Type of service */
-		if ((off = arg_short_long(argv[i], "-Q", "--tos=")) != -1) {
+		if ((off = arg_parse_short_long(argv[i], "-Q", "--tos=")) != -1) {
+			int tmp;
 			ret = arg_parse_name_int(argc, argv, &i, &tmp, off,
 			    socket_parse_address_family);
@@ -240,5 +231,6 @@
 		
 		/* Time to live */
-		if ((off = arg_short_long(argv[i], "-t", "--ttl=")) != -1) {
+		if ((off = arg_parse_short_long(argv[i], "-t", "--ttl=")) != -1) {
+			int tmp;
 			ret = arg_parse_name_int(argc, argv, &i, &tmp, off,
 			    socket_parse_address_family);