From 6b6445eeb92e9ef40e08348691c47aa3153c088d Mon Sep 17 00:00:00 2001
From: Nathan Binkert <binkertn@umich.edu>
Date: Sat, 4 Jun 2005 14:16:04 -0400
Subject: more portable

arch/alpha/alpha_tru64_process.cc:
    Sort #includes
    Make code more portable. g++ doesn't seem to always like
    struct ::stat (and others). So, we typedef stat outside of
    the namespace as something else and use the typedef
base/hostinfo.cc:
    use snprintf to quell warning
base/inifile.cc:
    use strncpy to quell warning
base/stats/events.cc:
    don't use strcpy
cpu/beta_cpu/btb.cc:
    use FloorLog2 instead of log2
cpu/beta_cpu/comm.hh:
cpu/beta_cpu/inst_queue.hh:
cpu/beta_cpu/sat_counter.hh:
    use sim/host.hh instead of stdint.h

--HG--
extra : convert_revision : 59bd9235dda74e72a8b6a70b3f3a981840384f3f
---
 base/hostinfo.cc     |  2 +-
 base/inifile.cc      |  5 +++--
 base/stats/events.cc | 11 ++++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'base')

diff --git a/base/hostinfo.cc b/base/hostinfo.cc
index cb5c04efc..6d07c957e 100644
--- a/base/hostinfo.cc
+++ b/base/hostinfo.cc
@@ -70,7 +70,7 @@ procInfo(char *filename, char *target)
     while (fp && !feof(fp) && !done) {
         if (fgets(line, 80, fp)) {
             if (strncmp(line, target, strlen(target)) == 0) {
-                sprintf(format, "%s %%lld", target);
+                snprintf(format, sizeof(format), "%s %%lld", target);
                 sscanf(line, format, &usage);
 
                 fclose(fp);
diff --git a/base/inifile.cc b/base/inifile.cc
index 862e4082f..cbb506c8b 100644
--- a/base/inifile.cc
+++ b/base/inifile.cc
@@ -79,7 +79,8 @@ IniFile::loadCPP(const string &file, vector<char *> &cppArgs)
 
     tmpf.close();
 
-    char *cfile = strcpy(new char[file.size() + 1], file.c_str());
+    char *cfile = strncpy(new char[file.size() + 1], file.c_str(),
+                          file.size());
     char *dir = dirname(cfile);
     char *dir_arg = NULL;
     if (*dir != '.') {
@@ -87,7 +88,7 @@ IniFile::loadCPP(const string &file, vector<char *> &cppArgs)
         arg += dir;
 
         dir_arg = new char[arg.size() + 1];
-        strcpy(dir_arg, arg.c_str());
+        strncpy(dir_arg, arg.c_str(), arg.size());
     }
 
     delete [] cfile;
diff --git a/base/stats/events.cc b/base/stats/events.cc
index dd7ec2ccf..e083cf0da 100644
--- a/base/stats/events.cc
+++ b/base/stats/events.cc
@@ -140,6 +140,10 @@ InsertEvent::insert(const string &stat)
 void
 InsertEvent::flush()
 {
+    static const char query_header[] = "INSERT INTO "
+        "events(ev_event, ev_run, ev_tick)"
+        "values";
+
     if (size) {
         MySQL::Connection &mysql = MySqlDB.conn();
         assert(mysql.connected());
@@ -147,12 +151,9 @@ InsertEvent::flush()
     }
 
     query[0] = '\0';
-    size = 0;
+    size = sizeof(query_header);
     first = true;
-    strcpy(query, "INSERT INTO "
-           "events(ev_event, ev_run, ev_tick)"
-           "values");
-    size = strlen(query);
+    memcpy(query, query_header, size);
 }
 
 void
-- 
cgit v1.2.3