Skip to content

Commit fc7847d

Browse files
committed
mge-mib.c : rename rogue ietf_* lookups to mge_*
1 parent 4797d11 commit fc7847d

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

drivers/mge-mib.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static info_lkp_t mge_transfer_reason_info[] = {
9494
{ 0, NULL, NULL, NULL }
9595
};
9696

97-
static info_lkp_t ietf_test_result_info[] = {
97+
static info_lkp_t mge_test_result_info[] = {
9898
{ 1, "done and passed", NULL, NULL },
9999
{ 2, "done and warning", NULL, NULL },
100100
{ 3, "done and error", NULL, NULL },
@@ -104,22 +104,22 @@ static info_lkp_t ietf_test_result_info[] = {
104104
{ 0, NULL, NULL, NULL }
105105
};
106106

107-
static info_lkp_t ietf_beeper_status_info[] = {
107+
static info_lkp_t mge_beeper_status_info[] = {
108108
{ 1, "disabled", NULL, NULL },
109109
{ 2, "enabled", NULL, NULL },
110110
{ 3, "muted", NULL, NULL },
111111
{ 0, NULL, NULL, NULL }
112112
};
113113

114-
static info_lkp_t ietf_yes_no_info[] = {
114+
static info_lkp_t mge_yes_no_info[] = {
115115
{ 1, "yes", NULL, NULL },
116116
{ 2, "no", NULL, NULL },
117117
{ 0, NULL, NULL, NULL }
118118
};
119119

120120
/* FIXME: the below may introduce status redundancy, that needs to be
121121
* addressed by the driver, as for usbhid-ups! */
122-
static info_lkp_t ietf_power_source_info[] = {
122+
static info_lkp_t mge_power_source_info[] = {
123123
{ 1, "" /* other */, NULL, NULL },
124124
{ 2, "OFF" /* none */, NULL, NULL },
125125
#if 0
@@ -154,17 +154,17 @@ static snmp_info_t mge_mib[] = {
154154
{ "ups.firmware", ST_FLAG_STRING, SU_INFOSIZE, ".1.3.6.1.4.1.705.1.1.4.0", "", SU_FLAG_STATIC | SU_FLAG_OK, NULL },
155155
{ "ups.firmware.aux", ST_FLAG_STRING, SU_INFOSIZE, ".1.3.6.1.4.1.705.1.12.12.0", "", SU_FLAG_STATIC | SU_FLAG_OK, NULL },
156156
{ "ups.load", 0, 1, ".1.3.6.1.4.1.705.1.7.2.1.4.1", "", SU_OUTPUT_1, NULL },
157-
{ "ups.beeper.status", ST_FLAG_STRING, SU_INFOSIZE, "1.3.6.1.2.1.33.1.9.8.0", "", 0, ietf_beeper_status_info },
157+
{ "ups.beeper.status", ST_FLAG_STRING, SU_INFOSIZE, "1.3.6.1.2.1.33.1.9.8.0", "", 0, mge_beeper_status_info },
158158
{ "ups.L1.load", 0, 1, ".1.3.6.1.4.1.705.1.7.2.1.4.1", "", SU_OUTPUT_3, NULL },
159159
{ "ups.L2.load", 0, 1, ".1.3.6.1.4.1.705.1.7.2.1.4.2", "", SU_OUTPUT_3, NULL },
160160
{ "ups.L3.load", 0, 1, ".1.3.6.1.4.1.705.1.7.2.1.4.3", "", SU_OUTPUT_3, NULL },
161-
{ "ups.test.result", ST_FLAG_STRING, SU_INFOSIZE, ".1.3.6.1.2.1.33.1.7.3.0", "", 0, ietf_test_result_info },
161+
{ "ups.test.result", ST_FLAG_STRING, SU_INFOSIZE, ".1.3.6.1.2.1.33.1.7.3.0", "", 0, mge_test_result_info },
162162
{ "ups.delay.shutdown", ST_FLAG_STRING | ST_FLAG_RW, 6, "1.3.6.1.2.1.33.1.8.2.0", DEFAULT_OFFDELAY, SU_FLAG_ABSENT | SU_FLAG_OK, NULL },
163163
{ "ups.delay.start", ST_FLAG_STRING | ST_FLAG_RW, 6, "1.3.6.1.2.1.33.1.8.3.0", DEFAULT_ONDELAY, SU_FLAG_ABSENT | SU_FLAG_OK, NULL },
164164
{ "ups.timer.shutdown", 0, 1, "1.3.6.1.2.1.33.1.8.2.0", "", SU_FLAG_OK, NULL },
165165
{ "ups.timer.start", 0, 1, "1.3.6.1.2.1.33.1.8.3.0", "", SU_FLAG_OK, NULL },
166166
{ "ups.timer.reboot", 0, 1, "1.3.6.1.2.1.33.1.8.4.0", "", SU_FLAG_OK, NULL },
167-
{ "ups.start.auto", ST_FLAG_RW, 1, "1.3.6.1.2.1.33.1.8.5.0", "", SU_FLAG_OK, ietf_yes_no_info },
167+
{ "ups.start.auto", ST_FLAG_RW, 1, "1.3.6.1.2.1.33.1.8.5.0", "", SU_FLAG_OK, mge_yes_no_info },
168168
/* status data */
169169
{ "ups.status", ST_FLAG_STRING, SU_INFOSIZE, ".1.3.6.1.4.1.705.1.5.11.0", "", SU_FLAG_OK | SU_STATUS_BATT, mge_replacebatt_info },
170170
{ "ups.status", ST_FLAG_STRING, SU_INFOSIZE, ".1.3.6.1.4.1.705.1.5.14.0", "", SU_FLAG_OK | SU_STATUS_BATT, mge_lowbatt_info },
@@ -175,7 +175,7 @@ static snmp_info_t mge_mib[] = {
175175
{ "ups.status", ST_FLAG_STRING, SU_INFOSIZE, ".1.3.6.1.4.1.705.1.7.8.0", "", SU_FLAG_OK | SU_STATUS_BATT, mge_boost_info },
176176
{ "ups.status", ST_FLAG_STRING, SU_INFOSIZE, ".1.3.6.1.4.1.705.1.7.10.0", "", SU_FLAG_OK | SU_STATUS_BATT, mge_overload_info },
177177
{ "ups.status", ST_FLAG_STRING, SU_INFOSIZE, ".1.3.6.1.4.1.705.1.7.12.0", "", SU_FLAG_OK | SU_STATUS_BATT, mge_trim_info },
178-
{ "ups.status", ST_FLAG_STRING, SU_INFOSIZE, ".1.3.6.1.2.1.33.1.4.1.0", "", SU_STATUS_PWR | SU_FLAG_OK, ietf_power_source_info },
178+
{ "ups.status", ST_FLAG_STRING, SU_INFOSIZE, ".1.3.6.1.2.1.33.1.4.1.0", "", SU_STATUS_PWR | SU_FLAG_OK, mge_power_source_info },
179179

180180
/* FIXME: Alarms
181181
* - upsmgBatteryChargerFault (.1.3.6.1.4.1.705.1.5.15.0), yes (1), no (2)

0 commit comments

Comments
 (0)