Ignore:
Timestamp:
Nov 29, 2012, 1:59:04 PM (13 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: updated trunk to 3.6.9

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/source3/librpc/gen_ndr/ndr_perfcount.c

    r745 r751  
    133133_PUBLIC_ enum ndr_err_code ndr_pull_PERF_COUNTER_BLOCK(struct ndr_pull *ndr, int ndr_flags, struct PERF_COUNTER_BLOCK *r)
    134134{
     135
    135136        if (ndr_flags & NDR_SCALARS) {
    136137                NDR_CHECK(ndr_pull_align(ndr, 4));
    137138                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->ByteLength));
    138                 NDR_PULL_ALLOC_N(ndr, r->data, r->ByteLength);
    139                 NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->data, r->ByteLength));
     139                size_data_0 = r->ByteLength;
     140                NDR_PULL_ALLOC_N(ndr, r->data, size_data_0);
     141                NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->data, size_data_0));
    140142                NDR_CHECK(ndr_pull_trailer_align(ndr, 4));
    141143        }
     
    269271_PUBLIC_ enum ndr_err_code ndr_pull_PERF_OBJECT_TYPE(struct ndr_pull *ndr, int ndr_flags, struct PERF_OBJECT_TYPE *r)
    270272{
     273
    271274        uint32_t cntr_counters_0;
    272275        TALLOC_CTX *_mem_save_counters_0;
     276
    273277        uint32_t cntr_instances_0;
    274278        TALLOC_CTX *_mem_save_instances_0;
     
    289293                NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->PerfTime));
    290294                NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->PerfFreq));
    291                 NDR_PULL_ALLOC_N(ndr, r->counters, r->NumCounters);
     295                size_counters_0 = r->NumCounters;
     296                NDR_PULL_ALLOC_N(ndr, r->counters, size_counters_0);
    292297                _mem_save_counters_0 = NDR_PULL_GET_MEM_CTX(ndr);
    293298                NDR_PULL_SET_MEM_CTX(ndr, r->counters, 0);
    294                 for (cntr_counters_0 = 0; cntr_counters_0 < r->NumCounters; cntr_counters_0++) {
     299                for (cntr_counters_0 = 0; cntr_counters_0 < ; cntr_counters_0++) {
    295300                        NDR_CHECK(ndr_pull_PERF_COUNTER_DEFINITION(ndr, NDR_SCALARS, &r->counters[cntr_counters_0]));
    296301                }
    297302                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_counters_0, 0);
    298                 NDR_PULL_ALLOC_N(ndr, r->instances, r->NumInstances);
     303                size_instances_0 = r->NumInstances;
     304                NDR_PULL_ALLOC_N(ndr, r->instances, size_instances_0);
    299305                _mem_save_instances_0 = NDR_PULL_GET_MEM_CTX(ndr);
    300306                NDR_PULL_SET_MEM_CTX(ndr, r->instances, 0);
    301                 for (cntr_instances_0 = 0; cntr_instances_0 < r->NumInstances; cntr_instances_0++) {
     307                for (cntr_instances_0 = 0; cntr_instances_0 < ; cntr_instances_0++) {
    302308                        NDR_CHECK(ndr_pull_PERF_INSTANCE_DEFINITION(ndr, NDR_SCALARS, &r->instances[cntr_instances_0]));
    303309                }
     
    307313        }
    308314        if (ndr_flags & NDR_BUFFERS) {
     315
    309316                _mem_save_instances_0 = NDR_PULL_GET_MEM_CTX(ndr);
    310317                NDR_PULL_SET_MEM_CTX(ndr, r->instances, 0);
    311                 for (cntr_instances_0 = 0; cntr_instances_0 < r->NumInstances; cntr_instances_0++) {
     318                for (cntr_instances_0 = 0; cntr_instances_0 < ; cntr_instances_0++) {
    312319                        NDR_CHECK(ndr_pull_PERF_INSTANCE_DEFINITION(ndr, NDR_BUFFERS, &r->instances[cntr_instances_0]));
    313320                }
     
    396403_PUBLIC_ enum ndr_err_code ndr_pull_PERF_DATA_BLOCK(struct ndr_pull *ndr, int ndr_flags, struct PERF_DATA_BLOCK *r)
    397404{
     405
    398406        uint32_t cntr_Signature_0;
    399407        uint32_t _ptr_data;
    400408        TALLOC_CTX *_mem_save_data_0;
     409
    401410        uint32_t cntr_objects_0;
    402411        TALLOC_CTX *_mem_save_objects_0;
    403412        if (ndr_flags & NDR_SCALARS) {
    404413                NDR_CHECK(ndr_pull_align(ndr, 8));
    405                 for (cntr_Signature_0 = 0; cntr_Signature_0 < 4; cntr_Signature_0++) {
     414                size_Signature_0 = 4;
     415                for (cntr_Signature_0 = 0; cntr_Signature_0 < size_Signature_0; cntr_Signature_0++) {
    406416                        NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->Signature[cntr_Signature_0]));
    407417                }
     
    426436                        r->data = NULL;
    427437                }
    428                 NDR_PULL_ALLOC_N(ndr, r->objects, r->NumObjectTypes);
     438                size_objects_0 = r->NumObjectTypes;
     439                NDR_PULL_ALLOC_N(ndr, r->objects, size_objects_0);
    429440                _mem_save_objects_0 = NDR_PULL_GET_MEM_CTX(ndr);
    430441                NDR_PULL_SET_MEM_CTX(ndr, r->objects, 0);
    431                 for (cntr_objects_0 = 0; cntr_objects_0 < r->NumObjectTypes; cntr_objects_0++) {
     442                for (cntr_objects_0 = 0; cntr_objects_0 < ; cntr_objects_0++) {
    432443                        NDR_CHECK(ndr_pull_PERF_OBJECT_TYPE(ndr, NDR_SCALARS, &r->objects[cntr_objects_0]));
    433444                }
     
    442453                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_0, 0);
    443454                }
     455
    444456                _mem_save_objects_0 = NDR_PULL_GET_MEM_CTX(ndr);
    445457                NDR_PULL_SET_MEM_CTX(ndr, r->objects, 0);
    446                 for (cntr_objects_0 = 0; cntr_objects_0 < r->NumObjectTypes; cntr_objects_0++) {
     458                for (cntr_objects_0 = 0; cntr_objects_0 < ; cntr_objects_0++) {
    447459                        NDR_CHECK(ndr_pull_PERF_OBJECT_TYPE(ndr, NDR_BUFFERS, &r->objects[cntr_objects_0]));
    448460                }
Note: See TracChangeset for help on using the changeset viewer.