VirtualBox

Changeset 13315 in vbox for trunk/src


Ignore:
Timestamp:
Oct 16, 2008 7:17:53 AM (16 years ago)
Author:
vboxsync
Message:

cosmetics

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/HostServices/SharedClipboard/x11.cpp

    r13219 r13315  
    201201    if (RT_FAILURE(ASMAtomicCmpXchgU32(&pCtx->waiter, 1, 0)))
    202202    {
    203         LogRel(("vboxClipboardReadDataFromClient: deadlock situation - the host and the guest are both waiting for data from the other."));
     203        LogRel(("vboxClipboardReadDataFromClient: deadlock situation - the host and the guest are both waiting for data from the other.\n"));
    204204        return VERR_DEADLOCK;
    205205    }
     
    209209    if (RTSemEventWait(pCtx->waitForData, CLIPBOARDTIMEOUT) != VINF_SUCCESS)
    210210    {
    211         LogRel (("vboxClipboardReadDataFromClient: vboxSvcClipboardReportMsg failed to complete within %d milliseconds\n", CLIPBOARDTIMEOUT));
     211        LogRel(("vboxClipboardReadDataFromClient: vboxSvcClipboardReportMsg failed to complete within %d milliseconds\n", CLIPBOARDTIMEOUT));
    212212        pCtx->guestFormats = 0;
    213213        pCtx->waiter = 0;
     
    695695static int vboxClipboardThread(RTTHREAD self, void * /* pvUser */)
    696696{
    697     LogRel (("Shared clipboard: starting host clipboard thread\n"));
     697    LogRel(("Shared clipboard: starting host clipboard thread\n"));
    698698
    699699    /* Set up a timer to poll the host clipboard */
     
    704704    RTSemEventDestroy(g_ctx.waitForData);
    705705    RTSemMutexDestroy(g_ctx.asyncMutex);
    706     LogRel (("Shared clipboard: host clipboard thread terminated successfully\n"));
     706    LogRel(("Shared clipboard: host clipboard thread terminated successfully\n"));
    707707    return VINF_SUCCESS;
    708708}
     
    710710int vboxClipboardInitX11 (void)
    711711{
    712 
    713712    /* Create a window and make it a clipboard viewer. */
    714713    int cArgc = 0;
     
    812811        rc = RTThreadCreate(&g_ctx.thread, vboxClipboardThread, 0, 0,
    813812                            RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "SHCLIP");
    814         if (!RT_SUCCESS(rc))
    815             LogRel(("Failed to start the host shared clipboard thread."));
    816     }
    817     if (!RT_SUCCESS(rc))
     813        if (RT_FAILURE(rc))
     814            LogRel(("Failed to start the host shared clipboard thread.\n"));
     815    }
     816    if (RT_FAILURE(rc))
    818817    {
    819818        RTSemEventDestroy(g_ctx.waitForData);
     
    10471046    if (pu16DestText == 0)
    10481047    {
    1049         LogRel (("vboxClipboardConvertUtf16: failed to allocate %d bytes\n", cwDestLen * 2));
     1048        LogRel(("vboxClipboardConvertUtf16: failed to allocate %d bytes\n", cwDestLen * 2));
    10501049        vboxClipboardEmptyGuestBuffer();
    10511050        return false;
     
    11181117    if (pu16DestText == 0)
    11191118    {
    1120         LogRel (("vboxClipboardConvertUtf8: failed to allocate %d bytes\n", cwDestLen * 2));
     1119        LogRel(("vboxClipboardConvertUtf8: failed to allocate %d bytes\n", cwDestLen * 2));
    11211120        vboxClipboardEmptyGuestBuffer();
    11221121        return false;
     
    11361135    if (pu8DestText == 0)
    11371136    {
    1138         LogRel (("vboxClipboardConvertUtf8: failed to allocate %d bytes\n", cwDestLen * 4));
     1137        LogRel(("vboxClipboardConvertUtf8: failed to allocate %d bytes\n", cwDestLen * 4));
    11391138        RTMemFree(reinterpret_cast<void *>(pu16DestText));
    11401139        vboxClipboardEmptyGuestBuffer();
     
    12111210    if (pu16DestText == 0)
    12121211    {
    1213         LogRel (("vboxClipboardConvertCText: failed to allocate %d bytes\n", cwDestLen * 2));
     1212        LogRel(("vboxClipboardConvertCText: failed to allocate %d bytes\n", cwDestLen * 2));
    12141213        vboxClipboardEmptyGuestBuffer();
    12151214        return false;
     
    14581457        if (RTSemEventWait(g_ctx.waitForData, CLIPBOARDTIMEOUT) != VINF_SUCCESS)
    14591458        {
    1460             LogRel (("vboxClipboardReadDataFromClient: XtGetSelectionValue failed to complete within %d milliseconds\n", CLIPBOARDTIMEOUT));
     1459            LogRel(("vboxClipboardReadDataFromClient: XtGetSelectionValue failed to complete within %d milliseconds\n", CLIPBOARDTIMEOUT));
    14611460            g_ctx.hostTextFormat = INVALID;
    14621461            g_ctx.hostBitmapFormat = INVALID;
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette