svn commit: trunk/busybox/miscutils

[aldot at busybox.net]

Author: aldot
Date: 2006-04-05 09:37:25 -0700 (Wed, 05 Apr 2006)
New Revision: 14757

Log:
- make sure that the label expected_hwif_error is visible even when
  CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF isn't set.


Modified:
   trunk/busybox/miscutils/hdparm.c


Changeset:
Modified: trunk/busybox/miscutils/hdparm.c
===================================================================
--- trunk/busybox/miscutils/hdparm.c	2006-04-05 16:21:37 UTC (rev 14756)
+++ trunk/busybox/miscutils/hdparm.c	2006-04-05 16:37:25 UTC (rev 14757)
@@ -7,22 +7,8 @@
  *
  * Hacked by Tito <farmatito at tiscali.it> for size optimization.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- *
  * This program is based on the source code of hdparm: see below...
  * hdparm.c - Command line interface to get/set hard disk parameters
  *          - by Mark Lord (C) 1994-2002 -- freely distributable
@@ -2785,8 +2771,10 @@
 						if (argc && isdigit(**argv))
 							p = *argv++, --argc;
 						else
+#endif /* CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF */
 expected_hwif_error:
 							bb_error_msg_and_die("expected hwif value"); /* "expected hwif_irq" */
+#ifdef CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF
 
 						sscanf(p, "%i", &hwif_irq);