Skip to content

Commit

Permalink
RDKBDEV-2828: A DOS line ending is \r\n. A Unix line ending is \n. (#224
Browse files Browse the repository at this point in the history
)

Reason for change:
The sequence \n\r is not a valid line ending on either system.
Test Procedure: Sanity.
Risks: None.
Signed-off-by: Andre McCurdy <[email protected]>

Co-authored-by: Andre McCurdy <[email protected]>
Co-authored-by: Karunakaran A <[email protected]>
  • Loading branch information
3 people authored Oct 23, 2024
1 parent de2749b commit e7aa4e5
Show file tree
Hide file tree
Showing 6 changed files with 505 additions and 505 deletions.
14 changes: 7 additions & 7 deletions sampleapps/consumer/rbusRawDataConsumer.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ static void generalEvent1Handler(
{
(void)handle;
(void)subscription;
printf("\nevent_receive_handler1 called\n\r");
printf("Event received %s\n\r", event->name);
printf("Event data: %s\n\r", (char*)event->rawData);
printf("Event data len: %d\n\r", event->rawDataLen);
printf("\n\r");
printf("\nevent_receive_handler1 called\r\n");
printf("Event received %s\r\n", event->name);
printf("Event data: %s\r\n", (char*)event->rawData);
printf("Event data len: %d\r\n", event->rawDataLen);
printf("\r\n");
}

int main(int argc, char *argv[])
Expand Down Expand Up @@ -71,7 +71,7 @@ int main(int argc, char *argv[])
rc = rbus_openDirect(handle, &directHandle, "Device.Provider1.Event1!");
if (RBUS_ERROR_SUCCESS != rc)
{
printf ("Failed to open direct connection to %s\n\r", "Device.Provider1.Event1!");
printf ("Failed to open direct connection to %s\r\n", "Device.Provider1.Event1!");
}
else
{
Expand Down Expand Up @@ -116,7 +116,7 @@ int main(int argc, char *argv[])
rc = rbus_closeDirect(directHandle);
if (RBUS_ERROR_SUCCESS != rc)
{
printf ("Failed to close direct connection to %s\n\r", "Device.Provider1.Event1!");
printf ("Failed to close direct connection to %s\r\n", "Device.Provider1.Event1!");
}
}
rbusEvent_UnsubscribeExRawData(handle, subscriptions, 1);
Expand Down
2 changes: 1 addition & 1 deletion sampleapps/consumer/rbusSampleConsumer.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ int main(int argc, char *argv[])
else
{
rbusProperty_t next = outputVals;
printf ("List of params\n\r");
printf ("List of params\r\n");
for (int i = 0; i < numOfOutVals; i++)
{
rbusValue_t val = rbusProperty_GetValue(next);
Expand Down
2 changes: 1 addition & 1 deletion src/rbus/rbus_object.c
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ void rbusObject_fwrite(rbusObject_t obj, int depth, FILE* fout)
VERIFY_NULL(fout);
for(i=0; i<depth; ++i)
fprintf(fout, " ");
fprintf(fout, "rbusObject name=%s\n\r", rbusObject_GetName(obj));
fprintf(fout, "rbusObject name=%s\r\n", rbusObject_GetName(obj));
prop = rbusObject_GetProperties(obj);
VERIFY_NULL(prop);
rbusProperty_fwrite(prop, depth+1, fout);
Expand Down
4 changes: 2 additions & 2 deletions src/rbus/rbus_property.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ void rbusProperty_fwrite(rbusProperty_t prop, int depth, FILE* fout)
VERIFY_NULL(fout);
for(i=0; i<depth; ++i)
fprintf(fout, " ");
fprintf(fout, "rbusProperty name=%s\n\r", rbusProperty_GetName(prop));
fprintf(fout, "rbusProperty name=%s\r\n", rbusProperty_GetName(prop));
rbusValue_fwrite(rbusProperty_GetValue(prop), depth+1, fout);
fprintf(fout,"\n\r");
fprintf(fout,"\r\n");
prop = rbusProperty_GetNext(prop);
if(prop)
rbusProperty_fwrite(prop, depth, fout);
Expand Down
2 changes: 1 addition & 1 deletion unittests/util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ void isElementPresent(rbusHandle_t handle, const char *elementName)
}
else
{
printf ("Failed to discover components. Error Code = %d\n\r", rc);
printf ("Failed to discover components. Error Code = %d\r\n", rc);
}
if(!elementFound) usleep(5000);
}
Expand Down
Loading

0 comments on commit e7aa4e5

Please sign in to comment.