4833 Remove volrmmount
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

@@ -15,14 +15,16 @@
  * If applicable, add the following below this CDDL HEADER, with the
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- */
-/*
+ *
+ *
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright 2014 Andrew Stormont.
  */
 
 /*
  * rmf_menu.c :
  *      Command line options to rmformat are processed in this file.

@@ -306,11 +308,11 @@
  */
 
 static void
 process_F_flag(smedia_handle_t handle, int32_t fd)
 {
-        uint32_t format_flag;
+        uint32_t format_flag = 0;
         int32_t old_per = 0;
         int32_t new_per, ret_val;
 
         if (force_format) {
                 (void) fprintf(stderr,

@@ -413,11 +415,11 @@
 {
         int retry;
         int removable;
         int total_devices_found_last_time;
         int defer = 0;
-        char *tmpstr;
+        char *tmpstr = NULL;
 
 #define MAX_RETRIES_FOR_SCANNING 3
 
         vol_running = volmgt_running();
         if (vol_running)