diff options
| author | Tor Brede Vekterli <vekterli@oath.com> | 2018-07-25 14:24:21 +0000 |
|---|---|---|
| committer | Tor Brede Vekterli <vekterli@oath.com> | 2018-07-25 14:24:21 +0000 |
| commit | 12c8f3005e202b31a8e0ff3816ce9d714a269046 (patch) | |
| tree | a5d9ba0eedc49df2cea2dbdfea677c4c37ed3775 /metrics | |
| parent | e3af3d215feb1e416b27b92bbf421dde281f3a09 (diff) | |
Remove stringref::c_str()
The expected semantics of c_str() (a null-terminated string) cannot
be satisfied with a string reference, so remove the function entirely
to prevent people from using it in buggy ways.
Replaces c_str() with data() in places where it is presumed safe,
otherwise constructs temporary string instances. Certain callsites
have been de-stringref'd in favor of regular strings, in particular
where C APIs have been transitively called. The vast majority of
these were called with string parameters anyway, so should not
cause much extra allocation.
Diffstat (limited to 'metrics')
| -rw-r--r-- | metrics/src/vespa/metrics/countmetric.cpp | 2 | ||||
| -rw-r--r-- | metrics/src/vespa/metrics/valuemetric.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/metrics/src/vespa/metrics/countmetric.cpp b/metrics/src/vespa/metrics/countmetric.cpp index a19b14f9545..0c2504b2077 100644 --- a/metrics/src/vespa/metrics/countmetric.cpp +++ b/metrics/src/vespa/metrics/countmetric.cpp @@ -14,7 +14,7 @@ AbstractCountMetric::logWarning(const char* msg, const char * op) const { vespalib::asciistream ost; ost << msg << " in count metric " << getPath() << " op " << op << ". Resetting it."; - LOG(warning, "%s", ost.str().c_str()); + LOG(warning, "%s", ost.str().data()); } void diff --git a/metrics/src/vespa/metrics/valuemetric.cpp b/metrics/src/vespa/metrics/valuemetric.cpp index 04b442829ed..48baa59c7a0 100644 --- a/metrics/src/vespa/metrics/valuemetric.cpp +++ b/metrics/src/vespa/metrics/valuemetric.cpp @@ -19,7 +19,7 @@ AbstractValueMetric::logWarning(const char* msg, const char * op) const { vespalib::asciistream ost; ost << msg << " in value metric " << getPath() << " op " << op << ". Resetting it."; - LOG(warning, "%s", ost.str().c_str()); + LOG(warning, "%s", ost.str().data()); } void |