From: Dan Mick <dan.mick@redhat.com>
Date: Mon, 24 Apr 2017 22:36:00 +0000 (-0700)
Subject: common/ConfUtils.cc parse_file: fix function name in errors
X-Git-Tag: v12.0.3~245^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=71728a437fc5a92ff014a118ce00f0cfd4c567b0;p=ceph.git

common/ConfUtils.cc parse_file: fix function name in errors

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/src/common/ConfUtils.cc b/src/common/ConfUtils.cc
index ff9055a8164c..bd964edeb054 100644
--- a/src/common/ConfUtils.cc
+++ b/src/common/ConfUtils.cc
@@ -112,14 +112,14 @@ parse_file(const std::string &fname, std::deque<std::string> *errors,
   if (fstat(fileno(fp), &st_buf)) {
     ret = -errno;
     ostringstream oss;
-    oss << "read_conf: failed to fstat '" << fname << "': " << cpp_strerror(ret);
+    oss << "parse_file: failed to fstat '" << fname << "': " << cpp_strerror(ret);
     errors->push_back(oss.str());
     goto done;
   }
 
   if (st_buf.st_size > MAX_CONFIG_FILE_SZ) {
     ostringstream oss;
-    oss << "read_conf: config file '" << fname << "' is " << st_buf.st_size
+    oss << "parse_file: config file '" << fname << "' is " << st_buf.st_size
 	<< " bytes, but the maximum is " << MAX_CONFIG_FILE_SZ;
     errors->push_back(oss.str());
     ret = -EINVAL;
@@ -137,14 +137,14 @@ parse_file(const std::string &fname, std::deque<std::string> *errors,
     if (ferror(fp)) {
       ret = -errno;
       ostringstream oss;
-      oss << "read_conf: fread error while reading '" << fname << "': "
+      oss << "parse_file: fread error while reading '" << fname << "': "
 	  << cpp_strerror(ret);
       errors->push_back(oss.str());
       goto done;
     }
     else {
       ostringstream oss;
-      oss << "read_conf: unexpected EOF while reading '" << fname << "': "
+      oss << "parse_file: unexpected EOF while reading '" << fname << "': "
 	  << "possible concurrent modification?";
       errors->push_back(oss.str());
       ret = -EIO;