From 831e8f4abb29f1ff66ebb8ab5ff496050ff677f7 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Sun, 30 May 2010 22:24:40 +0000 Subject: Remove unneeded #include statements completely Unistd.h was only used to get a definition of NULL in all files. Add our own NULL #define and remove unistd.h from flash.h stdio.h has no place in flash.h, it should be included only in files which really need it. Add #include statements in individual .c files where needed. Replace a few printf with msg_* to eliminate the need for stdio.h. Corresponding to flashrom svn r1021. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Uwe Hermann --- physmap.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'physmap.c') diff --git a/physmap.c b/physmap.c index 1f47ce0..7642938 100644 --- a/physmap.c +++ b/physmap.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include #include #include #include @@ -310,8 +312,8 @@ int wrmsr(int addr, msr_t msr) int setup_cpu_msr(int cpu) { char msrfilename[64]; - memset(msrfilename, 0, 64); - sprintf(msrfilename, "/dev/cpu/%d/msr", cpu); + memset(msrfilename, 0, sizeof(msrfilename)); + snprintf(msrfilename, sizeof(msrfilename), "/dev/cpu/%d/msr", cpu); if (fd_msr != -1) { msg_pinfo("MSR was already initialized\n"); @@ -393,8 +395,8 @@ int wrmsr(int addr, msr_t msr) int setup_cpu_msr(int cpu) { char msrfilename[64]; - memset(msrfilename, 0, 64); - sprintf(msrfilename, "/dev/cpu%d", cpu); + memset(msrfilename, 0, sizeof(msrfilename)); + snprintf(msrfilename, sizeof(msrfilename), "/dev/cpu%d", cpu); if (fd_msr != -1) { msg_pinfo("MSR was already initialized\n"); -- cgit v1.1