From 21c39f780fa0425d28cb2a65954890a93d8ded67 Mon Sep 17 00:00:00 2001
From: Adam Wujek <adam.wujek@cern.ch>
Date: Fri, 27 Mar 2015 14:09:31 +0100
Subject: [PATCH] userspace/snmpd: add Group suffix to files with groups
No technical change. Make names more clear and consistent.
Renamed:
--wrsTemperature to wrsTemperatureGroup
--wrsOSStatus to wrsOSStatusGroup
Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
---
userspace/snmpd/Makefile | 4 ++--
userspace/snmpd/init.c | 8 ++++----
userspace/snmpd/wrsCurrentTimeGroup.c | 2 +-
userspace/snmpd/wrsGeneralStatusGroup.c | 6 +++---
userspace/snmpd/{wrsOSStatus.c => wrsOSStatusGroup.c} | 8 ++++----
userspace/snmpd/{wrsOSStatus.h => wrsOSStatusGroup.h} | 8 ++++----
userspace/snmpd/wrsStartCntGroup.c | 4 ++--
.../snmpd/{wrsTemperature.c => wrsTemperatureGroup.c} | 6 +++---
.../snmpd/{wrsTemperature.h => wrsTemperatureGroup.h} | 8 ++++----
userspace/snmpd/wrsVersionGroup.c | 2 +-
10 files changed, 28 insertions(+), 28 deletions(-)
rename userspace/snmpd/{wrsOSStatus.c => wrsOSStatusGroup.c} (92%)
rename userspace/snmpd/{wrsOSStatus.h => wrsOSStatusGroup.h} (74%)
rename userspace/snmpd/{wrsTemperature.c => wrsTemperatureGroup.c} (94%)
rename userspace/snmpd/{wrsTemperature.h => wrsTemperatureGroup.h} (81%)
diff --git a/userspace/snmpd/Makefile b/userspace/snmpd/Makefile
index 95ab43791..6fb1c285d 100644
--- a/userspace/snmpd/Makefile
+++ b/userspace/snmpd/Makefile
@@ -33,8 +33,8 @@ SOURCES = \
shmem.c \
wrsPtpDataTable.c \
wrsCurrentTimeGroup.c \
- wrsTemperature.c \
- wrsOSStatus.c \
+ wrsTemperatureGroup.c \
+ wrsOSStatusGroup.c \
wrsVersionGroup.c \
wrsPortStatusTable.c \
wrsGeneralStatusGroup.c
diff --git a/userspace/snmpd/init.c b/userspace/snmpd/init.c
index 5ed374290..58153a0be 100644
--- a/userspace/snmpd/init.c
+++ b/userspace/snmpd/init.c
@@ -12,8 +12,8 @@
#include "wrsPstatsTable.h"
#include "wrsPtpDataTable.h"
#include "wrsCurrentTimeGroup.h"
-#include "wrsTemperature.h"
-#include "wrsOSStatus.h"
+#include "wrsTemperatureGroup.h"
+#include "wrsOSStatusGroup.h"
#include "wrsVersionGroup.h"
#include "wrsPortStatusTable.h"
#include "wrsGeneralStatusGroup.h"
@@ -28,8 +28,8 @@ void init_wrsSnmp(void)
init_wrsPstatsTable();
init_wrsPtpDataTable();
init_wrsCurrentTimeGroup();
- init_wrsTemperature();
- init_wrsOSStatus();
+ init_wrsTemperatureGroup();
+ init_wrsOSStatusGroup();
init_wrsVersionGroup();
init_wrsPortStatusTable();
init_wrsGeneralStatusGroup();
diff --git a/userspace/snmpd/wrsCurrentTimeGroup.c b/userspace/snmpd/wrsCurrentTimeGroup.c
index 6fcacc31e..5b909dbc4 100644
--- a/userspace/snmpd/wrsCurrentTimeGroup.c
+++ b/userspace/snmpd/wrsCurrentTimeGroup.c
@@ -107,7 +107,7 @@ time_t wrsCurrentTime_data_fill(void)
#define GT_PICKINFO wrsCurrentTime_pickinfo
#define GT_DATA_FILL_FUNC wrsCurrentTime_data_fill
#define GT_DATA_STRUCT wrsCurrentTime_s
-#define GT_GROUP_NAME "wrsCurrentTime"
+#define GT_GROUP_NAME "wrsCurrentTimeGroup"
#define GT_INIT_FUNC init_wrsCurrentTimeGroup
#include "wrsGroupTemplate.h"
diff --git a/userspace/snmpd/wrsGeneralStatusGroup.c b/userspace/snmpd/wrsGeneralStatusGroup.c
index 2a12ade1e..fafaa3e8d 100644
--- a/userspace/snmpd/wrsGeneralStatusGroup.c
+++ b/userspace/snmpd/wrsGeneralStatusGroup.c
@@ -1,12 +1,12 @@
#include "wrsSnmp.h"
-#include "shmem_snmp.h"
+#include "snmp_shmem.h"
#include "wrsCurrentTimeGroup.h"
-#include "wrsOSStatus.h"
+#include "wrsOSStatusGroup.h"
#include "wrsPortStatusTable.h"
#include "wrsPstatsTable.h"
#include "wrsPtpDataTable.h"
#include "wrsStartCntGroup.h"
-#include "wrsTemperature.h"
+#include "wrsTemperatureGroup.h"
#include "wrsVersionGroup.h"
#include "wrsGeneralStatusGroup.h"
diff --git a/userspace/snmpd/wrsOSStatus.c b/userspace/snmpd/wrsOSStatusGroup.c
similarity index 92%
rename from userspace/snmpd/wrsOSStatus.c
rename to userspace/snmpd/wrsOSStatusGroup.c
index 214d3b362..73b9beb74 100644
--- a/userspace/snmpd/wrsOSStatus.c
+++ b/userspace/snmpd/wrsOSStatusGroup.c
@@ -1,6 +1,6 @@
#include "wrsSnmp.h"
-#include "wrsTemperature.h"
-#include "wrsOSStatus.h"
+#include "wrsTemperatureGroup.h"
+#include "wrsOSStatusGroup.h"
static struct pickinfo wrsOSStatus_pickinfo[] = {
FIELD(wrsOSStatus_s, ASN_INTEGER, wrsBootSuccessful),
@@ -52,7 +52,7 @@ time_t wrsOSStatus_data_fill(void)
#define GT_PICKINFO wrsOSStatus_pickinfo
#define GT_DATA_FILL_FUNC wrsOSStatus_data_fill
#define GT_DATA_STRUCT wrsOSStatus_s
-#define GT_GROUP_NAME "wrsOSStatus"
-#define GT_INIT_FUNC init_wrsOSStatus
+#define GT_GROUP_NAME "wrsOSStatusGroup"
+#define GT_INIT_FUNC init_wrsOSStatusGroup
#include "wrsGroupTemplate.h"
diff --git a/userspace/snmpd/wrsOSStatus.h b/userspace/snmpd/wrsOSStatusGroup.h
similarity index 74%
rename from userspace/snmpd/wrsOSStatus.h
rename to userspace/snmpd/wrsOSStatusGroup.h
index 1b81a91fe..cfe7ad4fa 100644
--- a/userspace/snmpd/wrsOSStatus.h
+++ b/userspace/snmpd/wrsOSStatusGroup.h
@@ -1,5 +1,5 @@
-#ifndef WRS_WRS_OSSTATUS_H
-#define WRS_WRS_OSSTATUS_H
+#ifndef WRS_OSSTATUS_GROUP_H
+#define WRS_OSSTATUS_GROUP_H
#define WRSOSSTATUS_OID WRS_OID, 254, 1, 1
@@ -14,6 +14,6 @@ struct wrsOSStatus_s {
extern struct wrsOSStatus_s wrsOSStatus_s;
time_t wrsOSStatus_data_fill(void);
-void init_wrsOSStatus(void);
+void init_wrsOSStatusGroup(void);
-#endif /* WRS_WRS_OSSTATUS_H */
+#endif /* WRS_OSSTATUS_GROUP_H */
diff --git a/userspace/snmpd/wrsStartCntGroup.c b/userspace/snmpd/wrsStartCntGroup.c
index e5540e134..4e30cb02e 100644
--- a/userspace/snmpd/wrsStartCntGroup.c
+++ b/userspace/snmpd/wrsStartCntGroup.c
@@ -1,5 +1,5 @@
#include "wrsSnmp.h"
-#include "shmem_snmp.h"
+#include "snmp_shmem.h"
#include "wrsStartCntGroup.h"
static struct pickinfo wrsStartCnt_pickinfo[] = {
@@ -38,7 +38,7 @@ time_t wrsStartCnt_data_fill(void){
#define GT_PICKINFO wrsStartCnt_pickinfo
#define GT_DATA_FILL_FUNC wrsStartCnt_data_fill
#define GT_DATA_STRUCT wrsStartCnt_s
-#define GT_GROUP_NAME "wrsStartCnt"
+#define GT_GROUP_NAME "wrsStartCntGroup"
#define GT_INIT_FUNC init_wrsStartCntGroup
#include "wrsGroupTemplate.h"
diff --git a/userspace/snmpd/wrsTemperature.c b/userspace/snmpd/wrsTemperatureGroup.c
similarity index 94%
rename from userspace/snmpd/wrsTemperature.c
rename to userspace/snmpd/wrsTemperatureGroup.c
index 78dda1d36..b03155e37 100644
--- a/userspace/snmpd/wrsTemperature.c
+++ b/userspace/snmpd/wrsTemperatureGroup.c
@@ -1,6 +1,6 @@
#include "wrsSnmp.h"
#include "snmp_shmem.h"
-#include "wrsTemperature.h"
+#include "wrsTemperatureGroup.h"
static struct pickinfo wrsTemperature_pickinfo[] = {
FIELD(wrsTemperature_s, ASN_INTEGER, temp_fpga),
@@ -61,7 +61,7 @@ time_t wrsTemperature_data_fill(void)
#define GT_PICKINFO wrsTemperature_pickinfo
#define GT_DATA_FILL_FUNC wrsTemperature_data_fill
#define GT_DATA_STRUCT wrsTemperature_s
-#define GT_GROUP_NAME "wrsTemperature"
-#define GT_INIT_FUNC init_wrsTemperature
+#define GT_GROUP_NAME "wrsTemperatureGroup"
+#define GT_INIT_FUNC init_wrsTemperatureGroup
#include "wrsGroupTemplate.h"
diff --git a/userspace/snmpd/wrsTemperature.h b/userspace/snmpd/wrsTemperatureGroup.h
similarity index 81%
rename from userspace/snmpd/wrsTemperature.h
rename to userspace/snmpd/wrsTemperatureGroup.h
index 3f961d6d5..3a42a8953 100644
--- a/userspace/snmpd/wrsTemperature.h
+++ b/userspace/snmpd/wrsTemperatureGroup.h
@@ -1,5 +1,5 @@
-#ifndef WRS_WRS_TEMPERATURE_H
-#define WRS_WRS_TEMPERATURE_H
+#ifndef WRS_TEMPERATURE_GROUP_H
+#define WRS_TEMPERATURE_GROUP_H
#define WRSTEMPERATURE_CACHE_TIMEOUT 5
#define WRSTEMPERATURE_OID WRS_OID, 6, 1, 3
@@ -18,5 +18,5 @@ struct wrsTemperature_s {
extern struct wrsTemperature_s wrsTemperature_s;
time_t wrsTemperature_data_fill(void);
-void init_wrsTemperature(void);
-#endif /* WRS_WRS_TEMPERATURE_H */
+void init_wrsTemperatureGroup(void);
+#endif /* WRS_TEMPERATURE_GROUP_H */
diff --git a/userspace/snmpd/wrsVersionGroup.c b/userspace/snmpd/wrsVersionGroup.c
index f32d8b452..a8dd4a177 100644
--- a/userspace/snmpd/wrsVersionGroup.c
+++ b/userspace/snmpd/wrsVersionGroup.c
@@ -92,7 +92,7 @@ time_t wrsVersion_data_fill(void)
#define GT_PICKINFO wrsVersion_pickinfo
#define GT_DATA_FILL_FUNC wrsVersion_data_fill
#define GT_DATA_STRUCT wrsVersion_s
-#define GT_GROUP_NAME "wrsVersion"
+#define GT_GROUP_NAME "wrsVersionGroup"
#define GT_INIT_FUNC init_wrsVersionGroup
#include "wrsGroupTemplate.h"
--
GitLab