Skip to content

Commit 7efbb45

Browse files
Change GError pointer into a local variable (#98)
Change-Id: Ic696238b0cca3b30acd8a01d4ec6f718845d4649
1 parent 6c859b9 commit 7efbb45

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/parameter.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ namespace acap_runtime {
3030

3131
Parameter::Parameter(bool verbose) : _verbose(verbose) {
3232
TRACELOG << "Init" << endl;
33-
_error = NULL;
34-
ax_parameter = ax_parameter_new(APP_NAME, &_error);
33+
GError* error = nullptr;
34+
ax_parameter = ax_parameter_new(APP_NAME, &error);
3535
if (ax_parameter == NULL) {
36-
ERRORLOG << "Error when creating axparameter: " << _error->message << endl;
37-
g_clear_error(&_error);
36+
ERRORLOG << "Error when creating axparameter: " << error->message << endl;
37+
g_clear_error(&error);
3838
throw runtime_error{"Could not Init Parameter Service"};
3939
}
4040
}
@@ -51,10 +51,11 @@ Status Parameter::GetValues(ServerContext* context, const Request* request, Resp
5151
return Status(StatusCode::INVALID_ARGUMENT, "No valid input request");
5252
}
5353
char* parameter_value = NULL;
54-
if (!ax_parameter_get(ax_parameter, parameter_key, &parameter_value, &_error)) {
55-
ERRORLOG << "Error when getting axparameter: " << _error->message << endl;
54+
GError* error = nullptr;
55+
if (!ax_parameter_get(ax_parameter, parameter_key, &parameter_value, &error)) {
56+
ERRORLOG << "Error when getting axparameter: " << error->message << endl;
5657
parameter_value = g_strdup("");
57-
g_clear_error(&_error);
58+
g_clear_error(&error);
5859
}
5960
TRACELOG << parameter_key << ": " << parameter_value << endl;
6061

src/parameter.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ class Parameter final : public keyvaluestore::KeyValueStore::Service {
4040
Status GetValues(ServerContext* context, const Request* request, Response* response) override;
4141

4242
AXParameter* ax_parameter;
43-
GError* _error;
4443
bool _verbose;
4544
};
4645
} // namespace acap_runtime

0 commit comments

Comments
 (0)