r329 - openbios-devel/drivers

Author: blueswirl
Date: 2008-12-28 16:27:19 +0100 (Sun, 28 Dec 2008)
New Revision: 329

Modified:
   openbios-devel/drivers/ide.c
Log:
Suppress -Wformat-security warning

Modified: openbios-devel/drivers/ide.c
===================================================================
--- openbios-devel/drivers/ide.c	2008-12-28 14:04:49 UTC (rev 328)
+++ openbios-devel/drivers/ide.c	2008-12-28 15:27:19 UTC (rev 329)
@@ -1313,8 +1313,6 @@
    	uint32_t io_port1, uint32_t ctl_port1)
 {
    int i, j;
-	const char * nodetemp_chan = "%s/"DEV_NAME;
-	const char * nodetemp = "%s/"DEV_NAME"/%s";
    char nodebuff[32];
    phandle_t dnode;

@@ -1363,7 +1361,7 @@

ob_ide_identify_drives(chan);

-		snprintf(nodebuff, sizeof(nodebuff), nodetemp_chan, path,
+                snprintf(nodebuff, sizeof(nodebuff), "%s/" DEV_NAME, path,
                          current_channel);
    	REGISTER_NAMED_NODE(ob_ide_ctrl, nodebuff);
    	printk(DEV_NAME": [io ports 0x%x-0x%x,0x%x]\n",
@@ -1393,8 +1391,9 @@
    				break;
    		}
    		printk("%s]: %s\n", media, drive->model);
-			snprintf(nodebuff, sizeof(nodebuff), nodetemp, path,
-                                 current_channel, media);
+                        snprintf(nodebuff, sizeof(nodebuff),
+                                 "%s/" DEV_NAME "/%s", path, current_channel,
+                                 media);
    		REGISTER_NAMED_NODE(ob_ide, nodebuff);
    		dnode=find_dev(nodebuff);
    		set_int_property(dnode, "reg", j);