indented.

2007-11-29 16:39:48 +00:00
parent 06d23fcf1f
commit 1477603af6
123 changed files with 1994 additions and 1688 deletions
@@ -55,22 +55,27 @@ int arf_encode_apdu(
        apdu[2] = invoke_id;
        apdu[3] = SERVICE_CONFIRMED_ATOMIC_READ_FILE;   /* service choice */
        apdu_len = 4;
-        apdu_len += encode_application_object_id(&apdu[apdu_len],
-            data->object_type, data->object_instance);
+        apdu_len +=
+            encode_application_object_id(&apdu[apdu_len], data->object_type,
+            data->object_instance);
        switch (data->access) {
            case FILE_STREAM_ACCESS:
                apdu_len += encode_opening_tag(&apdu[apdu_len], 0);
-                apdu_len += encode_application_signed(&apdu[apdu_len],
+                apdu_len +=
+                    encode_application_signed(&apdu[apdu_len],
                    data->type.stream.fileStartPosition);
-                apdu_len += encode_application_unsigned(&apdu[apdu_len],
+                apdu_len +=
+                    encode_application_unsigned(&apdu[apdu_len],
                    data->type.stream.requestedOctetCount);
                apdu_len += encode_closing_tag(&apdu[apdu_len], 0);
                break;
            case FILE_RECORD_ACCESS:
                apdu_len += encode_opening_tag(&apdu[apdu_len], 1);
-                apdu_len += encode_application_signed(&apdu[apdu_len],
+                apdu_len +=
+                    encode_application_signed(&apdu[apdu_len],
                    data->type.record.fileStartRecord);
-                apdu_len += encode_application_unsigned(&apdu[apdu_len],
+                apdu_len +=
+                    encode_application_unsigned(&apdu[apdu_len],
                    data->type.record.RecordCount);
                apdu_len += encode_closing_tag(&apdu[apdu_len], 1);
                break;
@@ -108,21 +113,25 @@ int arf_decode_service_request(
            /* a tag number is not extended so only one octet */
            len++;
            /* fileStartPosition */
-            tag_len = decode_tag_number_and_value(&apdu[len],
-                &tag_number, &len_value_type);
+            tag_len =
+                decode_tag_number_and_value(&apdu[len], &tag_number,
+                &len_value_type);
            len += tag_len;
            if (tag_number != BACNET_APPLICATION_TAG_SIGNED_INT)
                return -1;
-            len += decode_signed(&apdu[len],
-                len_value_type, &data->type.stream.fileStartPosition);
+            len +=
+                decode_signed(&apdu[len], len_value_type,
+                &data->type.stream.fileStartPosition);
            /* requestedOctetCount */
-            tag_len = decode_tag_number_and_value(&apdu[len],
-                &tag_number, &len_value_type);
+            tag_len =
+                decode_tag_number_and_value(&apdu[len], &tag_number,
+                &len_value_type);
            len += tag_len;
            if (tag_number != BACNET_APPLICATION_TAG_UNSIGNED_INT)
                return -1;
-            len += decode_unsigned(&apdu[len],
-                len_value_type, &data->type.stream.requestedOctetCount);
+            len +=
+                decode_unsigned(&apdu[len], len_value_type,
+                &data->type.stream.requestedOctetCount);
            if (!decode_is_closing_tag_number(&apdu[len], 0))
                return -1;
            /* a tag number is not extended so only one octet */
@@ -132,21 +141,25 @@ int arf_decode_service_request(
            /* a tag number is not extended so only one octet */
            len++;
            /* fileStartRecord */
-            tag_len = decode_tag_number_and_value(&apdu[len],
-                &tag_number, &len_value_type);
+            tag_len =
+                decode_tag_number_and_value(&apdu[len], &tag_number,
+                &len_value_type);
            len += tag_len;
            if (tag_number != BACNET_APPLICATION_TAG_SIGNED_INT)
                return -1;
-            len += decode_signed(&apdu[len],
-                len_value_type, &data->type.record.fileStartRecord);
+            len +=
+                decode_signed(&apdu[len], len_value_type,
+                &data->type.record.fileStartRecord);
            /* RecordCount */
-            tag_len = decode_tag_number_and_value(&apdu[len],
-                &tag_number, &len_value_type);
+            tag_len =
+                decode_tag_number_and_value(&apdu[len], &tag_number,
+                &len_value_type);
            len += tag_len;
            if (tag_number != BACNET_APPLICATION_TAG_UNSIGNED_INT)
                return -1;
-            len += decode_unsigned(&apdu[len],
-                len_value_type, &data->type.record.RecordCount);
+            len +=
+                decode_unsigned(&apdu[len], len_value_type,
+                &data->type.record.RecordCount);
            if (!decode_is_closing_tag_number(&apdu[len], 1))
                return -1;
            /* a tag number is not extended so only one octet */
@@ -179,8 +192,8 @@ int arf_decode_apdu(
    offset = 4;

    if (apdu_len > offset) {
-        len = arf_decode_service_request(&apdu[offset],
-            apdu_len - offset, data);
+        len =
+            arf_decode_service_request(&apdu[offset], apdu_len - offset, data);
    }

    return len;
@@ -205,19 +218,24 @@ int arf_ack_encode_apdu(
        switch (data->access) {
            case FILE_STREAM_ACCESS:
                apdu_len += encode_opening_tag(&apdu[apdu_len], 0);
-                apdu_len += encode_application_signed(&apdu[apdu_len],
+                apdu_len +=
+                    encode_application_signed(&apdu[apdu_len],
                    data->type.stream.fileStartPosition);
-                apdu_len += encode_application_octet_string(&apdu[apdu_len],
+                apdu_len +=
+                    encode_application_octet_string(&apdu[apdu_len],
                    &data->fileData);
                apdu_len += encode_closing_tag(&apdu[apdu_len], 0);
                break;
            case FILE_RECORD_ACCESS:
                apdu_len += encode_opening_tag(&apdu[apdu_len], 1);
-                apdu_len += encode_application_signed(&apdu[apdu_len],
+                apdu_len +=
+                    encode_application_signed(&apdu[apdu_len],
                    data->type.record.fileStartRecord);
-                apdu_len += encode_application_unsigned(&apdu[apdu_len],
+                apdu_len +=
+                    encode_application_unsigned(&apdu[apdu_len],
                    data->type.record.RecordCount);
-                apdu_len += encode_application_octet_string(&apdu[apdu_len],
+                apdu_len +=
+                    encode_application_octet_string(&apdu[apdu_len],
                    &data->fileData);
                apdu_len += encode_closing_tag(&apdu[apdu_len], 1);
                break;
@@ -253,21 +271,25 @@ int arf_ack_decode_service_request(
            /* a tag number is not extended so only one octet */
            len++;
            /* fileStartPosition */
-            tag_len = decode_tag_number_and_value(&apdu[len],
-                &tag_number, &len_value_type);
+            tag_len =
+                decode_tag_number_and_value(&apdu[len], &tag_number,
+                &len_value_type);
            len += tag_len;
            if (tag_number != BACNET_APPLICATION_TAG_SIGNED_INT)
                return -1;
-            len += decode_signed(&apdu[len],
-                len_value_type, &data->type.stream.fileStartPosition);
+            len +=
+                decode_signed(&apdu[len], len_value_type,
+                &data->type.stream.fileStartPosition);
            /* fileData */
-            tag_len = decode_tag_number_and_value(&apdu[len],
-                &tag_number, &len_value_type);
+            tag_len =
+                decode_tag_number_and_value(&apdu[len], &tag_number,
+                &len_value_type);
            len += tag_len;
            if (tag_number != BACNET_APPLICATION_TAG_OCTET_STRING)
                return -1;
-            len += decode_octet_string(&apdu[len],
-                len_value_type, &data->fileData);
+            len +=
+                decode_octet_string(&apdu[len], len_value_type,
+                &data->fileData);
            if (!decode_is_closing_tag_number(&apdu[len], 0))
                return -1;
            /* a tag number is not extended so only one octet */
@@ -277,29 +299,35 @@ int arf_ack_decode_service_request(
            /* a tag number is not extended so only one octet */
            len++;
            /* fileStartRecord */
-            tag_len = decode_tag_number_and_value(&apdu[len],
-                &tag_number, &len_value_type);
+            tag_len =
+                decode_tag_number_and_value(&apdu[len], &tag_number,
+                &len_value_type);
            len += tag_len;
            if (tag_number != BACNET_APPLICATION_TAG_SIGNED_INT)
                return -1;
-            len += decode_signed(&apdu[len],
-                len_value_type, &data->type.record.fileStartRecord);
+            len +=
+                decode_signed(&apdu[len], len_value_type,
+                &data->type.record.fileStartRecord);
            /* returnedRecordCount */
-            tag_len = decode_tag_number_and_value(&apdu[len],
-                &tag_number, &len_value_type);
+            tag_len =
+                decode_tag_number_and_value(&apdu[len], &tag_number,
+                &len_value_type);
            len += tag_len;
            if (tag_number != BACNET_APPLICATION_TAG_UNSIGNED_INT)
                return -1;
-            len += decode_unsigned(&apdu[len],
-                len_value_type, &data->type.record.RecordCount);
+            len +=
+                decode_unsigned(&apdu[len], len_value_type,
+                &data->type.record.RecordCount);
            /* fileData */
-            tag_len = decode_tag_number_and_value(&apdu[len],
-                &tag_number, &len_value_type);
+            tag_len =
+                decode_tag_number_and_value(&apdu[len], &tag_number,
+                &len_value_type);
            len += tag_len;
            if (tag_number != BACNET_APPLICATION_TAG_OCTET_STRING)
                return -1;
-            len += decode_octet_string(&apdu[len],
-                len_value_type, &data->fileData);
+            len +=
+                decode_octet_string(&apdu[len], len_value_type,
+                &data->fileData);
            if (!decode_is_closing_tag_number(&apdu[len], 1))
                return -1;
            /* a tag number is not extended so only one octet */
@@ -331,8 +359,9 @@ int arf_ack_decode_apdu(
    offset = 3;

    if (apdu_len > offset) {
-        len = arf_ack_decode_service_request(&apdu[offset],
-            apdu_len - offset, data);
+        len =
+            arf_ack_decode_service_request(&apdu[offset], apdu_len - offset,
+            data);
    }

    return len;
@@ -364,15 +393,19 @@ void testAtomicReadFileAckAccess(
    ct_test(pTest, test_data.endOfFile == data->endOfFile);
    ct_test(pTest, test_data.access == data->access);
    if (test_data.access == FILE_STREAM_ACCESS) {
-        ct_test(pTest, test_data.type.stream.fileStartPosition ==
+        ct_test(pTest,
+            test_data.type.stream.fileStartPosition ==
            data->type.stream.fileStartPosition);
    } else if (test_data.access == FILE_RECORD_ACCESS) {
-        ct_test(pTest, test_data.type.record.fileStartRecord ==
+        ct_test(pTest,
+            test_data.type.record.fileStartRecord ==
            data->type.record.fileStartRecord);
-        ct_test(pTest, test_data.type.record.RecordCount ==
+        ct_test(pTest,
+            test_data.type.record.RecordCount ==
            data->type.record.RecordCount);
    }
-    ct_test(pTest, octetstring_length(&test_data.fileData) ==
+    ct_test(pTest,
+        octetstring_length(&test_data.fileData) ==
        octetstring_length(&data->fileData));
    ct_test(pTest, memcmp(octetstring_value(&test_data.fileData),
            octetstring_value(&data->fileData),
@@ -389,16 +422,16 @@ void testAtomicReadFileAck(
    data.endOfFile = true;
    data.access = FILE_STREAM_ACCESS;
    data.type.stream.fileStartPosition = 0;
-    octetstring_init(&data.fileData,
-        test_octet_string, sizeof(test_octet_string));
+    octetstring_init(&data.fileData, test_octet_string,
+        sizeof(test_octet_string));
    testAtomicReadFileAckAccess(pTest, &data);

    data.endOfFile = false;
    data.access = FILE_RECORD_ACCESS;
    data.type.record.fileStartRecord = 1;
    data.type.record.RecordCount = 2;
-    octetstring_init(&data.fileData,
-        test_octet_string, sizeof(test_octet_string));
+    octetstring_init(&data.fileData, test_octet_string,
+        sizeof(test_octet_string));
    testAtomicReadFileAckAccess(pTest, &data);

    return;
@@ -425,14 +458,18 @@ void testAtomicReadFileAccess(
    ct_test(pTest, test_data.object_instance == data->object_instance);
    ct_test(pTest, test_data.access == data->access);
    if (test_data.access == FILE_STREAM_ACCESS) {
-        ct_test(pTest, test_data.type.stream.fileStartPosition ==
+        ct_test(pTest,
+            test_data.type.stream.fileStartPosition ==
            data->type.stream.fileStartPosition);
-        ct_test(pTest, test_data.type.stream.requestedOctetCount ==
+        ct_test(pTest,
+            test_data.type.stream.requestedOctetCount ==
            data->type.stream.requestedOctetCount);
    } else if (test_data.access == FILE_RECORD_ACCESS) {
-        ct_test(pTest, test_data.type.record.fileStartRecord ==
+        ct_test(pTest,
+            test_data.type.record.fileStartRecord ==
            data->type.record.fileStartRecord);
-        ct_test(pTest, test_data.type.record.RecordCount ==
+        ct_test(pTest,
+            test_data.type.record.RecordCount ==
            data->type.record.RecordCount);
    }
 }