Commit e47a26d9 authored by Adam Wujek's avatar Adam Wujek 💬

userspace/snmpd: (no tech change) rename fields in the wrsSpllVersionGroup_s

Rename fields in the struct wrsSpllVersionGroup_s to reflect SNMP objects'
names.

commit_id -> wrsSpllVersion
build_date -> wrsSpllBuildDate
build_by -> wrsSpllBuildBy
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent 3f93266e
......@@ -9,9 +9,9 @@
static struct spll_stats *spll_stats_p;
static struct pickinfo wrsSpllVersion_pickinfo[] = {
FIELD(wrsSpllVersion_s, ASN_OCTET_STR, commit_id),
FIELD(wrsSpllVersion_s, ASN_OCTET_STR, build_date),
FIELD(wrsSpllVersion_s, ASN_OCTET_STR, build_by),
FIELD(wrsSpllVersion_s, ASN_OCTET_STR, wrsSpllVersion),
FIELD(wrsSpllVersion_s, ASN_OCTET_STR, wrsSpllBuildDate),
FIELD(wrsSpllVersion_s, ASN_OCTET_STR, wrsSpllBuildBy),
};
struct wrsSpllVersion_s wrsSpllVersion_s;
......@@ -63,17 +63,17 @@ time_t wrsSpllVersion_data_fill(void)
* version 2 */
if (spll_stats_p->ver == 2 || spll_stats_p->ver == 3) {
int len;
strncpy_e(wrsSpllVersion_s.commit_id, spll_stats_p->commit_id, 32);
strncpy_e(wrsSpllVersion_s.wrsSpllVersion, spll_stats_p->commit_id, 32);
/* concatenate date and time */
strncpy_e(wrsSpllVersion_s.build_date, spll_stats_p->build_date, 16);
len = strnlen(wrsSpllVersion_s.build_date, 32);
wrsSpllVersion_s.build_date[len] = ' '; /* put space instead of null */
strncpy_e(wrsSpllVersion_s.wrsSpllBuildDate, spll_stats_p->build_date, 16);
len = strnlen(wrsSpllVersion_s.wrsSpllBuildDate, 32);
wrsSpllVersion_s.wrsSpllBuildDate[len] = ' '; /* put space instead of null */
/* add time after added space at the end of string */
strncpy_e(&wrsSpllVersion_s.build_date[len + 1], spll_stats_p->build_time, 16 - 1);
strncpy_e(&wrsSpllVersion_s.wrsSpllBuildDate[len + 1], spll_stats_p->build_time, 16 - 1);
}
/* buil_by was introduced in version 3 */
if (spll_stats_p->ver == 3) {
strncpy_e(wrsSpllVersion_s.build_by, spll_stats_p->build_by, 32);
strncpy_e(wrsSpllVersion_s.wrsSpllBuildBy, spll_stats_p->build_by, 32);
}
/* there was an update, return current time */
return time_update;
......
......@@ -5,9 +5,9 @@
#define WRSSPLLVERSION_OID WRS_OID, 7, 3, 1
struct wrsSpllVersion_s {
char commit_id[32];
char build_date[32];
char build_by[32];
char wrsSpllVersion[32];
char wrsSpllBuildDate[32];
char wrsSpllBuildBy[32];
};
extern struct wrsSpllVersion_s wrsSpllVersion_s;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment