{.AttributeID = SDP_ATTRIBUTE_NAME        , .AttributeData = &SDP_Attribute_Name},\r
                {.AttributeID = SDP_ATTRIBUTE_DESCRIPTION , .AttributeData = &SDP_Attribute_Description},\r
                {.AttributeID = SDP_ATTRIBUTE_AVAILABILITY, .AttributeData = &SDP_Attribute_Availability},\r
-               {.AttributeData = NULL}\r
+               SERVICE_ATTRIBUTE_TABLE_TERMINATOR\r
        };\r
 \r
 SERVICE_ATTRIBUTE_TEXT(RFCOMM_Attribute_Name,             "RFCOMM");\r
                {.AttributeID = SDP_ATTRIBUTE_NAME        , .AttributeData = &RFCOMM_Attribute_Name},\r
                {.AttributeID = SDP_ATTRIBUTE_DESCRIPTION , .AttributeData = &RFCOMM_Attribute_Description},\r
                {.AttributeID = SDP_ATTRIBUTE_AVAILABILITY, .AttributeData = &RFCOMM_Attribute_Availability},\r
-               {.AttributeData = NULL}\r
+               SERVICE_ATTRIBUTE_TABLE_TERMINATOR\r
        };\r
        \r
 const ServiceTable_t SDP_Services_Table[] =\r
        SDP_PDUHeader_t* SDPHeader = (SDP_PDUHeader_t*)Data;\r
        SDPHeader->ParameterLength = SwapEndian_16(SDPHeader->ParameterLength);\r
 \r
-       BT_SDP_DEBUG(1, "SDP Packet Received", NULL);\r
+       BT_SDP_DEBUG(1, "SDP Packet Received");\r
        BT_SDP_DEBUG(2, "-- PDU ID: 0x%02X", SDPHeader->PDU);\r
        BT_SDP_DEBUG(2, "-- Param Length: 0x%04X", SDPHeader->ParameterLength);\r
 \r
 \r
 static void ServiceDiscovery_ProcessServiceSearch(SDP_PDUHeader_t* SDPHeader)\r
 {\r
-       BT_SDP_DEBUG(1, "<< Service Search", NULL);\r
+       BT_SDP_DEBUG(1, "<< Service Search");\r
 }\r
 \r
 static void ServiceDiscovery_ProcessServiceAttribute(SDP_PDUHeader_t* SDPHeader)\r
 {\r
-       BT_SDP_DEBUG(1, "<< Service Attribute", NULL);\r
+       BT_SDP_DEBUG(1, "<< Service Attribute");\r
 }\r
 \r
 static void ServiceDiscovery_ProcessServiceSearchAttribute(SDP_PDUHeader_t* SDPHeader)\r
 {\r
        void* CurrentParameter = ((void*)SDPHeader + sizeof(SDP_PDUHeader_t));\r
        \r
-       BT_SDP_DEBUG(1, "<< Service Search Attribute", NULL);\r
+       BT_SDP_DEBUG(1, "<< Service Search Attribute");\r
        \r
        uint8_t ElementHeaderSize;\r
 \r