summaryrefslogtreecommitdiffstats
path: root/recipes-extended/openhpi-subagent/files/openhpi-subagent-2.3.4-format.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-extended/openhpi-subagent/files/openhpi-subagent-2.3.4-format.patch')
-rw-r--r--recipes-extended/openhpi-subagent/files/openhpi-subagent-2.3.4-format.patch193
1 files changed, 193 insertions, 0 deletions
diff --git a/recipes-extended/openhpi-subagent/files/openhpi-subagent-2.3.4-format.patch b/recipes-extended/openhpi-subagent/files/openhpi-subagent-2.3.4-format.patch
new file mode 100644
index 0000000..7a9306e
--- /dev/null
+++ b/recipes-extended/openhpi-subagent/files/openhpi-subagent-2.3.4-format.patch
@@ -0,0 +1,193 @@
1diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAnnouncementTable.c openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c
2--- openhpi-subagent-2.3.4.orig/src/saHpiAnnouncementTable.c 2006-09-13 17:41:26.000000000 +0200
3+++ openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c 2009-10-26 11:04:01.000000000 +0100
4@@ -429,7 +429,7 @@ int announcement_add (saHpiAnnouncementT
5 if (rc != SA_OK) {
6 DEBUGMSGTL ((AGENT,
7 "announcement_add: oh_encode_entitypath Failed:"
8- " rc = %d\n",
9+ " rc = %s\n",
10 oh_lookup_error(rc)));
11 }
12
13@@ -450,7 +450,7 @@ int announcement_add (saHpiAnnouncementT
14 if (rc != SA_OK) {
15 DEBUGMSGTL ((AGENT,
16 "announcement_add: oh_encode_eventstate Failed:"
17- " rc = %d\n",
18+ " rc = %s\n",
19 oh_lookup_error(rc)));
20 }
21 }
22diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAreaTable.c openhpi-subagent-2.3.4/src/saHpiAreaTable.c
23--- openhpi-subagent-2.3.4.orig/src/saHpiAreaTable.c 2006-09-13 17:41:26.000000000 +0200
24+++ openhpi-subagent-2.3.4/src/saHpiAreaTable.c 2009-10-26 11:04:01.000000000 +0100
25@@ -1111,7 +1111,7 @@ void saHpiAreaTable_set_reserve1( netsnm
26 dri_entry->entry_id++;
27 } else {
28 DEBUGMSGTL ((AGENT,"dri_entry->entry_id [%d]\n", dri_entry->entry_id));
29- DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiAreaId_INDEX] [%d]\n", row_ctx->index.oids[saHpiAreaId_INDEX]));
30+ DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiAreaId_INDEX] [%ld]\n", row_ctx->index.oids[saHpiAreaId_INDEX]));
31 DEBUGMSGTL ((AGENT,
32 "ERROR: saHpiAreaTable_set_reserve1() User specified AreaId invalid!!!\n"));
33 rc = SNMP_ERR_WRONGVALUE;
34diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAutoInsertTimeoutTable.c openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c
35--- openhpi-subagent-2.3.4.orig/src/saHpiAutoInsertTimeoutTable.c 2006-09-13 17:41:26.000000000 +0200
36+++ openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c 2009-10-26 11:04:01.000000000 +0100
37@@ -587,7 +587,7 @@ void saHpiAutoInsertTimeoutTable_set_res
38 rc = SNMP_ERR_WRONGLENGTH;
39 DEBUGMSGTL ((AGENT,
40 "COLUMN_SAHPIAUTOINSERTTIMEOUTFORINSERT"
41- " SNMP_ERR_WRONGLENGTH\n", rc));
42+ " SNMP_ERR_WRONGLENGTH\n"));
43 }
44 }
45 break;
46diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiDomainInfoTable.c openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c
47--- openhpi-subagent-2.3.4.orig/src/saHpiDomainInfoTable.c 2006-09-13 17:41:26.000000000 +0200
48+++ openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c 2009-10-26 11:04:01.000000000 +0100
49@@ -350,7 +350,7 @@ int handle_saHpiDomainInfoActiveEntries(
50 netsnmp_agent_request_info *reqinfo,
51 netsnmp_request_info *requests)
52 {
53- DEBUGMSGTL ((AGENT, "handle_saHpiDomainInfoActiveEntries: Entry Count is %d\n",
54+ DEBUGMSGTL ((AGENT, "handle_saHpiDomainInfoActiveEntries: Entry Count is %ld\n",
55 domain_info_entry_count));
56
57 /* We are never called for a GETNEXT if it's registered as a
58diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiDomainReferenceTable.c openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c
59--- openhpi-subagent-2.3.4.orig/src/saHpiDomainReferenceTable.c 2006-09-13 17:41:26.000000000 +0200
60+++ openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c 2009-10-26 11:04:01.000000000 +0100
61@@ -220,7 +220,7 @@ handle_saHpiDomainReferenceActiveEntries
62 netsnmp_request_info *requests)
63 {
64 DEBUGMSGTL ((AGENT,
65- "handle_saHpiDomainReferenceActiveEntries: Entry Count is %d\n",
66+ "handle_saHpiDomainReferenceActiveEntries: Entry Count is %ld\n",
67 domain_reference_entry_count));
68
69 domain_reference_entry_count = CONTAINER_SIZE (cb.container);
70diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiEventLogInfoTable.c openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c
71--- openhpi-subagent-2.3.4.orig/src/saHpiEventLogInfoTable.c 2006-09-13 17:41:26.000000000 +0200
72+++ openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c 2009-10-26 11:04:01.000000000 +0100
73@@ -1184,7 +1184,7 @@ void saHpiEventLogInfoTable_set_reserve1
74 rc = SNMP_ERR_WRONGLENGTH;
75 DEBUGMSGTL ((AGENT,
76 "COLUMN_SAHPIEVENTLOGINFOTIME"
77- " SNMP_ERR_WRONGLENGTH\n", rc));
78+ " SNMP_ERR_WRONGLENGTH\n"));
79 }
80 }
81
82diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiFieldTable.c openhpi-subagent-2.3.4/src/saHpiFieldTable.c
83--- openhpi-subagent-2.3.4.orig/src/saHpiFieldTable.c 2006-09-13 17:41:26.000000000 +0200
84+++ openhpi-subagent-2.3.4/src/saHpiFieldTable.c 2009-10-26 11:04:01.000000000 +0100
85@@ -1409,7 +1409,7 @@ void saHpiFieldTable_set_reserve1( netsn
86 } else {
87 DEBUGMSGTL ((AGENT,"***********************************************\n"));
88 DEBUGMSGTL ((AGENT,"dria_entry->entry_id [%d]\n", dria_entry->entry_id));
89- DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiFieldId_INDEX] [%d]\n",
90+ DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiFieldId_INDEX] [%ld]\n",
91 row_ctx->index.oids[saHpiFieldId_field_INDEX]));
92 DEBUGMSGTL ((AGENT,
93 "ERROR: saHpiFieldTable_set_reserve1() User specified FieldId invalid!!!\n"));
94diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiHotSwapTable.c openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c
95--- openhpi-subagent-2.3.4.orig/src/saHpiHotSwapTable.c 2006-09-13 17:41:26.000000000 +0200
96+++ openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c 2009-10-26 11:04:01.000000000 +0100
97@@ -997,7 +997,7 @@ void saHpiHotSwapTable_set_reserve1( net
98 rc = SNMP_ERR_WRONGLENGTH;
99 DEBUGMSGTL ((AGENT,
100 "COLUMN_SAHPIHOTSWAPEXTRACTTIMEOUT"
101- " SNMP_ERR_WRONGLENGTH\n", rc));
102+ " SNMP_ERR_WRONGLENGTH\n"));
103 }
104 }
105 break;
106diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiRdrTable.c openhpi-subagent-2.3.4/src/saHpiRdrTable.c
107--- openhpi-subagent-2.3.4.orig/src/saHpiRdrTable.c 2006-09-13 17:41:26.000000000 +0200
108+++ openhpi-subagent-2.3.4/src/saHpiRdrTable.c 2009-10-26 11:04:01.000000000 +0100
109@@ -492,7 +492,7 @@ int populate_saHpiRdrTable(SaHpiSessionI
110
111 rdr_entry_count = CONTAINER_SIZE (cb.container);
112
113- DEBUGMSGTL ((AGENT, "populate_saHpiRdrTable: rdr_entry_count = %d\n", rdr_entry_count));
114+ DEBUGMSGTL ((AGENT, "populate_saHpiRdrTable: rdr_entry_count = %ld\n", rdr_entry_count));
115
116
117 subagent_unlock(&hpi_lock_data);
118@@ -528,8 +528,8 @@ SaErrorT clear_rdr_container(SaHpiDomain
119 do {
120 rdr_ctx = CONTAINER_FIND(cb.container, row_idx);
121
122- DEBUGMSGTL ((AGENT, "CONTAINER_FIND: rdr_ctx: [%d] row_idx: [%d]"
123- " counter [%d], rdr_entry_count [%d]\n",
124+ DEBUGMSGTL ((AGENT, "CONTAINER_FIND: rdr_ctx: [%p] row_idx: [%p]"
125+ " counter [%d], rdr_entry_count [%ld]\n",
126 rdr_ctx, row_idx, counter++, rdr_entry_count));
127
128 row_idx = CONTAINER_NEXT(cb.container, row_idx);
129diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiResourceTable.c openhpi-subagent-2.3.4/src/saHpiResourceTable.c
130--- openhpi-subagent-2.3.4.orig/src/saHpiResourceTable.c 2006-09-13 17:41:26.000000000 +0200
131+++ openhpi-subagent-2.3.4/src/saHpiResourceTable.c 2009-10-26 11:04:07.000000000 +0100
132@@ -254,8 +254,8 @@ int populate_saHpiResourceTable(SaHpiSes
133
134 DEBUGMSGTL ((AGENT, "populate_saHpiResourceTable RptEntry.ResourceTag.DataLength rv = %d\n",
135 RptEntry.ResourceTag.DataLength));
136- DEBUGMSGTL ((AGENT, "populate_saHpiResourceTable strlen(RptEntry.ResourceTag.Data) rv = %d\n",
137- strlen((const char *)RptEntry.ResourceTag.Data)));
138+ DEBUGMSGTL ((AGENT, "populate_saHpiResourceTable strlen(RptEntry.ResourceTag.Data) rv = %ld\n",
139+ (long)strlen((const char *)RptEntry.ResourceTag.Data)));
140
141
142 /** INTEGER = ASN_INTEGER */
143@@ -322,7 +322,7 @@ int populate_saHpiResourceTable(SaHpiSes
144
145 resource_entry_count = CONTAINER_SIZE (cb.container);
146
147- DEBUGMSGTL ((AGENT, "resource_entry_count = %d\n", resource_entry_count));
148+ DEBUGMSGTL ((AGENT, "resource_entry_count = %ld\n", resource_entry_count));
149
150 subagent_unlock(&hpi_lock_data);
151
152@@ -630,7 +630,7 @@ DEBUGMSGTL ((AGENT, "**** MIB_FALSE [%d]
153 resource_entry_count = CONTAINER_SIZE (cb.container);
154
155
156- DEBUGMSGTL ((AGENT, "async_event_resource: resource_entry_count = %d\n",
157+ DEBUGMSGTL ((AGENT, "async_event_resource: resource_entry_count = %ld\n",
158 resource_entry_count));
159
160 return rv;
161@@ -828,7 +828,7 @@ int handle_saHpiResourceActiveEntries(ne
162 {
163
164 DEBUGMSGTL ((AGENT,
165- "handle_saHpiResourceActiveEntries: Entry Count is %d\n",
166+ "handle_saHpiResourceActiveEntries: Entry Count is %ld\n",
167 resource_entry_count));
168
169 /* We are never called for a GETNEXT if it's registered as a
170diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiUserEventLogTable.c openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c
171--- openhpi-subagent-2.3.4.orig/src/saHpiUserEventLogTable.c 2006-09-13 17:41:26.000000000 +0200
172+++ openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c 2009-10-26 11:04:01.000000000 +0100
173@@ -1076,7 +1076,7 @@ void saHpiUserEventLogTable_set_reserve1
174 } else {
175 DEBUGMSGTL ((AGENT,"***********************************************\n"));
176 DEBUGMSGTL ((AGENT,"dr_entry->entry_id [%d]\n", dr_entry->entry_id));
177- DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_log_INDEX] [%d]\n",
178+ DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_log_INDEX] [%ld]\n",
179 row_ctx->index.oids[saHpiUserEventEntryId_event_log_INDEX]));
180 DEBUGMSGTL ((AGENT,
181 "ERROR: saHpiUserEventLogTable_set_reserve1() "
182diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiUserEventTable.c openhpi-subagent-2.3.4/src/saHpiUserEventTable.c
183--- openhpi-subagent-2.3.4.orig/src/saHpiUserEventTable.c 2006-09-13 17:41:26.000000000 +0200
184+++ openhpi-subagent-2.3.4/src/saHpiUserEventTable.c 2009-10-26 11:04:01.000000000 +0100
185@@ -1158,7 +1158,7 @@ void saHpiUserEventTable_set_reserve1( n
186 } else {
187 DEBUGMSGTL ((AGENT,"***********************************************\n"));
188 DEBUGMSGTL ((AGENT,"dr_entry->entry_id [%d]\n", dr_entry->entry_id));
189- DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_INDEX] [%d]\n",
190+ DEBUGMSGTL ((AGENT,"row_ctx->index.oids[saHpiUserEventEntryId_event_INDEX] [%ld]\n",
191 row_ctx->index.oids[saHpiUserEventEntryId_event_INDEX]));
192 DEBUGMSGTL ((AGENT,
193 "ERROR: saHpiUserEventTable_set_reserve1() User specified UserEventEntryId invalid!!!\n"));
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-04 21:11:08 +0000