Changeset 745 for trunk/server/source3/librpc/gen_ndr/ndr_perfcount.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/librpc/gen_ndr/ndr_perfcount.c (modified) (9 diffs)

trunk/server/source3/librpc/gen_ndr/ndr_perfcount.c

@@ -45 +45 @@
 {
         ndr_print_struct(ndr, name, "SYSTEMTIME");
+
         ndr->depth++;
         ndr_print_uint16(ndr, "year", r->year);
@@ -102 +103 @@
 {
         ndr_print_struct(ndr, name, "PERF_COUNTER_DEFINITION");
+
         ndr->depth++;
         ndr_print_uint32(ndr, "ByteLength", r->ByteLength);
@@ -146 +148 @@
 {
         ndr_print_struct(ndr, name, "PERF_COUNTER_BLOCK");
+
         ndr->depth++;
         ndr_print_uint32(ndr, "ByteLength", r->ByteLength);
@@ -209 +212 @@
 {
         ndr_print_struct(ndr, name, "PERF_INSTANCE_DEFINITION");
+
         ndr->depth++;
         ndr_print_uint32(ndr, "ByteLength", r->ByteLength);
@@ -318 +322 @@
         uint32_t cntr_instances_0;
         ndr_print_struct(ndr, name, "PERF_OBJECT_TYPE");
+
         ndr->depth++;
         ndr_print_uint32(ndr, "TotalByteLength", r->TotalByteLength);
@@ -336 +341 @@
         ndr->depth++;
         for (cntr_counters_0=0;cntr_counters_0<r->NumCounters;cntr_counters_0++) {
-                char *idx_0=NULL;
-                if (asprintf(&idx_0, "[%d]", cntr_counters_0) != -1) {
-                        ndr_print_PERF_COUNTER_DEFINITION(ndr, "counters", &r->counters[cntr_counters_0]);
-                        free(idx_0);
-                }
+                ndr_print_PERF_COUNTER_DEFINITION(ndr, "counters", &r->counters[cntr_counters_0]);
         }
         ndr->depth--;
@@ -346 +347 @@
         ndr->depth++;
         for (cntr_instances_0=0;cntr_instances_0<r->NumInstances;cntr_instances_0++) {
-                char *idx_0=NULL;
-                if (asprintf(&idx_0, "[%d]", cntr_instances_0) != -1) {
-                        ndr_print_PERF_INSTANCE_DEFINITION(ndr, "instances", &r->instances[cntr_instances_0]);
-                        free(idx_0);
-                }
+                ndr_print_PERF_INSTANCE_DEFINITION(ndr, "instances", &r->instances[cntr_instances_0]);
         }
         ndr->depth--;
@@ -460 +457 @@
         uint32_t cntr_objects_0;
         ndr_print_struct(ndr, name, "PERF_DATA_BLOCK");
+
         ndr->depth++;
         ndr->print(ndr, "%s: ARRAY(%d)", "Signature", (int)4);
         ndr->depth++;
         for (cntr_Signature_0=0;cntr_Signature_0<4;cntr_Signature_0++) {
-                char *idx_0=NULL;
-                if (asprintf(&idx_0, "[%d]", cntr_Signature_0) != -1) {
-                        ndr_print_uint16(ndr, "Signature", r->Signature[cntr_Signature_0]);
-                        free(idx_0);
-                }
+                ndr_print_uint16(ndr, "Signature", r->Signature[cntr_Signature_0]);
         }
         ndr->depth--;
@@ -494 +488 @@
         ndr->depth++;
         for (cntr_objects_0=0;cntr_objects_0<r->NumObjectTypes;cntr_objects_0++) {
-                char *idx_0=NULL;
-                if (asprintf(&idx_0, "[%d]", cntr_objects_0) != -1) {
-                        ndr_print_PERF_OBJECT_TYPE(ndr, "objects", &r->objects[cntr_objects_0]);
-                        free(idx_0);
-                }
-        }
-        ndr->depth--;
-        ndr->depth--;
-}
-
+                ndr_print_PERF_OBJECT_TYPE(ndr, "objects", &r->objects[cntr_objects_0]);
+        }
+        ndr->depth--;
+        ndr->depth--;
+}
+