VirtualBox

Changeset 45356 in vbox


Ignore:
Timestamp:
Apr 5, 2013 7:01:27 AM (12 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
84772
Message:

tabs

Location:
trunk/src/VBox
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp

    r44529 r45356  
    55
    66/*
    7  * Copyright (C) 2007-2012 Oracle Corporation
     7 * Copyright (C) 2007-2013 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    383383
    384384#elif defined(RT_OS_HAIKU)
    385         /* The ioctl hook in Haiku does take the len parameter when specified,
    386          * so just use it.
    387          */
     385    /* The ioctl hook in Haiku does take the len parameter when specified,
     386     * so just use it. */
    388387    int rc = ioctl((int)g_File, iFunction, pvData, cbData);
    389388    if (RT_LIKELY(rc == 0))

  • trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

    r44912 r45356  
    55
    66/*
    7  * Copyright (C) 2009-2012 Oracle Corporation
     7 * Copyright (C) 2009-2013 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    393393static dbus_bool_t vboxService_dbus_message_get_args(DBusMessage *message,
    394394                                                     DBusError   *error,
    395                                                      int              first_arg_type,
     395                                                     int first_arg_type,
    396396                                                     ...)
    397397{

  • trunk/src/VBox/Additions/haiku/VBoxTray/VBoxGuestDeskbarView.h

    r43364 r45356  
    55
    66/*
    7  * Copyright (C) 2012 Oracle Corporation
     7 * Copyright (C) 2012-2013 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    7272        virtual ~VBoxGuestDeskbarView();
    7373
    74                 static  BArchivable*   Instantiate(BMessage *data);
     74        static  BArchivable*   Instantiate(BMessage *data);
    7575        virtual status_t       Archive(BMessage *data, bool deep = true) const;
    7676

  • trunk/src/VBox/Additions/haiku/VBoxVideo/driver/driver.cpp

    r43415 r45356  
    55
    66/*
    7  * Copyright (C) 2012 Oracle Corporation
     7 * Copyright (C) 2012 Oracle-2013 Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    114114struct DeviceInfo
    115115{
    116     uint32          openCount;                  /* Count of how many times device has been opened */
    117     uint32          flags;                                      /* Device flags */
    118     area_id         sharedArea;                 /* Area shared between driver and all accelerants */
    119     SharedInfo     *sharedInfo;                 /* Pointer to shared info area memory */
    120     pci_info        pciInfo;                    /* Copy of pci info for this device */
     116    uint32          openCount;              /* Count of how many times device has been opened */
     117    uint32          flags;                  /* Device flags */
     118    area_id         sharedArea;             /* Area shared between driver and all accelerants */
     119    SharedInfo     *sharedInfo;             /* Pointer to shared info area memory */
     120    pci_info        pciInfo;                /* Copy of pci info for this device */
    121121    char            name[B_OS_NAME_LENGTH]; /* Name of device */
    122122};

  • trunk/src/VBox/Additions/linux/drm/vboxvideo.h

    r44529 r45356  
    55
    66/*
    7  * Copyright (C) 2011-2012 Oracle Corporation
     7 * Copyright (C) 2011-2013 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    6868    struct vboxvideo_mode_info  mode_info;
    6969
    70     int                             num_crtc;
     70    int                 num_crtc;
    7171};
    7272
    73 #endif                /* __DRM_VBOXVIDEO_H__ */
     73#endif /* __DRM_VBOXVIDEO_H__ */

  • trunk/src/VBox/Additions/x11/vboxmouse/vboxmouse.c

    r44528 r45356  
    44
    55/*
    6  * Copyright (C) 2006-2012 Oracle Corporation
     6 * Copyright (C) 2006-2013 Oracle Corporation
    77 *
    88 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    117117#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
    118118                                 VBoxPtrCtrlProc, GetMotionHistorySize(),
    119                                                                 2 /* Number of axes */
     119                                2 /* Number of axes */
    120120#else
    121121# error Unsupported version of X.Org

  • trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

    r45000 r45356  
    66
    77/*
    8  * Copyright (C) 2006-2012 Oracle Corporation
     8 * Copyright (C) 2006-2013 Oracle Corporation
    99 *
    1010 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    157157{
    158158    {VBOX_DEVICEID, "vbox"},
    159     {-1,        NULL}
     159    {-1,            NULL}
    160160};
    161161
    162162static PciChipsets VBOXPCIchipsets[] = {
    163163  { VBOX_DEVICEID, VBOX_DEVICEID, RES_SHARED_VGA },
    164   { -1,         -1,                 RES_UNDEFINED },
     164  { -1,            -1,            RES_UNDEFINED },
    165165};
    166166
    … …  
    199199/* No options for now */
    200200static const OptionInfoRec VBOXOptions[] = {
    201     { -1,               NULL,           OPTV_NONE,      {0},    FALSE }
     201    { -1, NULL, OPTV_NONE, {0}, FALSE }
    202202};
    203203
    … …  
    391391    /* We always like modes specified by the user in the configuration
    392392     * file and modes requested by the host, as doing otherwise is likely to
    393         * annoy people. */
     393    * annoy people. */
    394394    if (   !(mode->type & M_T_USERDEF)
    395395        && !(mode->type & M_T_PREFERRED)
    … …  
    576576    0,                          /* Module minor version. Xorg-specific */
    577577    1,                          /* Module patchlevel. Xorg-specific */
    578     ABI_CLASS_VIDEODRV,         /* This is a video driver */
     578    ABI_CLASS_VIDEODRV,         /* This is a video driver */
    579579    ABI_VIDEODRV_VERSION,
    580580    MOD_CLASS_VIDEODRV,
    … …  
    11311131    /* colourmap code */
    11321132    if (!miCreateDefColormap(pScreen))
    1133         return (FALSE);
     1133        return (FALSE);
    11341134
    11351135    if(!xf86HandleColormaps(pScreen, 256, 8, vboxLoadPalette, NULL, 0))

  • trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

    r45000 r45356  
    102102#include "xf86Cursor.h"
    103103
    104 #define VBOX_VERSION            4000  /* Why? */
    105 #define VBOX_NAME                     "VBoxVideo"
    106 #define VBOX_DRIVER_NAME          "vboxvideo"
     104#define VBOX_VERSION            4000  /* Why? */
     105#define VBOX_NAME               "VBoxVideo"
     106#define VBOX_DRIVER_NAME        "vboxvideo"
    107107
    108108#ifdef VBOX_DRI

  • trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c

    r44528 r45356  
    55
    66/*
    7  * Copyright (C) 2006-2012 Oracle Corporation
     7 * Copyright (C) 2006-2013 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    251251        sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
    252252            ((pciConfigPtr)pVBox->pciInfo->thisCard)->busnum,
    253                 ((pciConfigPtr)pVBox->pciInfo->thisCard)->devnum,
     253            ((pciConfigPtr)pVBox->pciInfo->thisCard)->devnum,
    254254            ((pciConfigPtr)pVBox->pciInfo->thisCard)->funcnum);
    255255#endif

  • trunk/src/VBox/Devices/Network/DevINIP.cpp

    r45025 r45356  
    339339        PDMDEV_SET_ERROR(pDevIns, rc,
    340340                         N_("Configuration error: Failed to get the \"IP\" value"));
    341         /* @todo: perhaps we should panic if IPv4 address isn't specify, with assumtion that
    342         * ISCSI target specified in IPv6 form. 
    343         */
     341        /* @todo: perhaps we should panic if IPv4 address isn't specify, with assumtion that
     342        * ISCSI target specified in IPv6 form. 
     343        */
    344344        return rc;
    345345    }
    … …  
    445445        }
    446446#else
    447         /* We've setup flags NETIF_FLAG_ETHARP and NETIF_FLAG_ETHERNET
    448           so this should be thread-safe. */
    449         tcpip_input(p,iface);
     447        /* We've setup flags NETIF_FLAG_ETHARP and NETIF_FLAG_ETHERNET
     448          so this should be thread-safe. */
     449        tcpip_input(p,iface);
    450450#endif
    451451    }

  • trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp

    r44824 r45356  
    55
    66/*
    7  * Copyright (C) 2006-2012 Oracle Corporation
     7 * Copyright (C) 2006-2013 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    49984998        case kIntNetTrunkType_WhateverNone:
    49994999#ifdef VBOX_WITH_NAT_SERVICE
    5000             /*
    5001              * Well, here we don't want load anything special,
    5002              * just communicate between processes via internal network.
    5003              */
    5004         case kIntNetTrunkType_SrvNat:
     5000            /*
     5001             * Well, here we don't want load anything special,
     5002             * just communicate between processes via internal network.
     5003             */
     5004        case kIntNetTrunkType_SrvNat:
    50055005#endif
    50065006            return VINF_SUCCESS;
    … …  
    50245024            break;
    50255025#ifndef VBOX_WITH_NAT_SERVICE   
    5026         case kIntNetTrunkType_SrvNat:
    5027             pszName = "VBoxSrvNat";
     5026        case kIntNetTrunkType_SrvNat:
     5027            pszName = "VBoxSrvNat";
    50285028            break;
    50295029#endif
    … …  
    54885488            if (   enmTrunkType == kIntNetTrunkType_WhateverNone
    54895489#ifdef VBOX_WITH_NAT_SERVICE
    5490                 || enmTrunkType == kIntNetTrunkType_SrvNat /* @todo: what does it mean */
     5490                || enmTrunkType == kIntNetTrunkType_SrvNat /* @todo: what does it mean */
    54915491#endif
    54925492                || (   pCur->enmTrunkType == enmTrunkType
    5493                     && !strcmp(pCur->szTrunk, pszTrunk)))
     5493                    && !strcmp(pCur->szTrunk, pszTrunk)))
    54945494            {
    54955495                rc = intnetR0CheckOpenNetworkFlags(pCur, fFlags);
    … …  
    55885588    if (   enmTrunkType == kIntNetTrunkType_WhateverNone
    55895589#ifdef VBOX_WITH_NAT_SERVICE
    5590         || enmTrunkType == kIntNetTrunkType_SrvNat /* simialar security */
     5590        || enmTrunkType == kIntNetTrunkType_SrvNat /* simialar security */
    55915591#endif
    55925592        || enmTrunkType == kIntNetTrunkType_None)
    … …  
    57565756        case kIntNetTrunkType_WhateverNone:
    57575757#ifdef VBOX_WITH_NAT_SERVICE
    5758         case kIntNetTrunkType_SrvNat:
     5758        case kIntNetTrunkType_SrvNat:
    57595759#endif
    57605760            if (*pszTrunk)

  • trunk/src/VBox/Devices/Storage/DrvVD.cpp

    r45061 r45356  
    931931        }
    932932#endif
    933         else
     933        else
    934934            return VERR_NET_ADDRESS_FAMILY_NOT_SUPPORTED;
    935935        return VINF_SUCCESS;
    … …  
    959959        }
    960960#ifdef VBOX_WITH_NEW_LWIP
    961         else if (   cbAddr == sizeof(struct sockaddr_in6)
     961        else if (   cbAddr == sizeof(struct sockaddr_in6)
    962962                 && u.Addr.sa_family == AF_INET6)
    963963        {

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

    r45156 r45356  
    55
    66/*
    7  * Copyright (C) 2006-2012 Oracle Corporation
     7 * Copyright (C) 2006-2013 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    517517            { "dhcpserver",       USAGE_DHCPSERVER,        handleDHCPServer},
    518518#ifdef VBOX_WITH_NAT_SERVICE
    519             { "natnetwork",       USAGE_NATNETWORK,        handleNATNetwork},
     519            { "natnetwork",       USAGE_NATNETWORK,        handleNATNetwork},
    520520#endif
    521521            { "extpack",          USAGE_EXTPACK,           handleExtPack},

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageNATNetwork.cpp

    r45156 r45356  
    55
    66/*
    7  * Copyright (C) 2006-2010 Oracle Corporation
     7 * Copyright (C) 2006-2013 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    204204            CHECK_ERROR(net, COMSETTER(Network)(Bstr(pNetworkCidr).raw()));
    205205            if(FAILED(rc))
    206               return errorArgument("Failed to set configuration");
     206              return errorArgument("Failed to set configuration");
    207207        }
    208208        if (dhcp >= 0)
    … …  
    224224            CHECK_ERROR(net, COMSETTER(Enabled) ((BOOL)enable));
    225225            if(FAILED(rc))
    226               return errorArgument("Failed to set configuration");
    227 
    228         }
    229         break;
     226              return errorArgument("Failed to set configuration");
     227
     228        }
     229        break;
    230230    }
    231231    case OP_REMOVE:
    … …  
    233233        CHECK_ERROR(a->virtualBox, RemoveNATNetwork(net));
    234234        if(FAILED(rc))
    235           return errorArgument("Failed to remove nat network");
    236         break;
     235          return errorArgument("Failed to remove nat network");
     236        break;
    237237    }
    238238    case OP_START:
    239239    {
    240         CHECK_ERROR(net, Start(Bstr("whatever").raw()));
     240        CHECK_ERROR(net, Start(Bstr("whatever").raw()));
    241241        if(FAILED(rc))
    242           return errorArgument("Failed to start network");
    243         break;
     242          return errorArgument("Failed to start network");
     243        break;
    244244    }
    245245    case OP_STOP:
    246246    {
    247         CHECK_ERROR(net, Stop());
     247        CHECK_ERROR(net, Stop());
    248248        if(FAILED(rc))
    249           return errorArgument("Failed to start network");
    250         break;
     249          return errorArgument("Failed to start network");
     250        break;
    251251    }
    252252    default:;

  • trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

    r45157 r45356  
    212212          allDHCPServers(lockDHCPServers),
    213213          lockNATNetworks(LOCKCLASS_LISTOFOTHEROBJECTS),
    214           allNATNetworks(lockNATNetworks),
     214          allNATNetworks(lockNATNetworks),
    215215          mtxProgressOperations(LOCKCLASS_PROGRESSLIST),
    216216          updateReq(UPDATEREQARG),
    … …  
    509509        }
    510510
    511         /* net services - nat networks */
    512         for (settings::NATNetworksList::const_iterator it = m->pMainConfigFile->llNATNetworks.begin();
     511        /* net services - nat networks */
     512        for (settings::NATNetworksList::const_iterator it = m->pMainConfigFile->llNATNetworks.begin();
    513513             it != m->pMainConfigFile->llNATNetworks.end();
    514514             ++it)
    … …  
    31813181}
    31823182void VirtualBox::onNATNetworkSetting(IN_BSTR aNetworkName, BOOL aEnabled,
    3183                                      IN_BSTR aNetwork, IN_BSTR aGateway,
    3184                                      BOOL aAdvertiseDefaultIpv6RouteEnabled,
    3185                                      BOOL fNeedDhcpServer)
     3183                                     IN_BSTR aNetwork, IN_BSTR aGateway,
     3184                                     BOOL aAdvertiseDefaultIpv6RouteEnabled,
     3185                                     BOOL fNeedDhcpServer)
    31863186{
    31873187    fireNATNetworkSettingEvent(m->pEventSource, aNetworkName, aEnabled,
    3188                                aNetwork, aGateway,
    3189                                aAdvertiseDefaultIpv6RouteEnabled, fNeedDhcpServer);
     3188                               aNetwork, aGateway,
     3189                               aAdvertiseDefaultIpv6RouteEnabled, fNeedDhcpServer);
    31903190}
    31913191
    31923192void VirtualBox::onNATNetworkPortForward(IN_BSTR aNetworkName, BOOL create, BOOL fIpv6,
    3193                                         IN_BSTR aRuleName, NATProtocol_T proto,
    3194                                         IN_BSTR aHostIp, LONG aHostPort,
    3195                                         IN_BSTR aGuestIp, LONG aGuestPort)
     3193                                        IN_BSTR aRuleName, NATProtocol_T proto,
     3194                                        IN_BSTR aHostIp, LONG aHostPort,
     3195                                        IN_BSTR aGuestIp, LONG aGuestPort)
    31963196{
    31973197    fireNATNetworkPortForwardEvent(m->pEventSource, aNetworkName, create,
    3198                                    fIpv6, aRuleName, proto,
    3199                                    aHostIp, aHostPort,
    3200                                    aGuestIp, aGuestPort);
     3198                                   fIpv6, aRuleName, proto,
     3199                                   aHostIp, aHostPort,
     3200                                   aGuestIp, aGuestPort);
    32013201}
    32023202
    … …  
    42794279
    42804280#ifdef VBOX_WITH_NAT_SERVICE
    4281         /* Saving NAT Network configuration */
     4281        /* Saving NAT Network configuration */
    42824282        m->pMainConfigFile->llNATNetworks.clear();
    42834283        {

  • trunk/src/VBox/Runtime/VBox/log-vbox.cpp

    r43387 r45356  
    55
    66/*
    7  * Copyright (C) 2006-2012 Oracle Corporation
     7 * Copyright (C) 2006-2013 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    375375        if (get_team_info(0, &info) == B_OK)
    376376        {
    377                 /* there is an info.argc, but no way to know arg boundaries */
     377            /* there is an info.argc, but no way to know arg boundaries */
    378378            RTLogLoggerEx(pLogger, 0, ~0U, "Commandline: %.64s\n", info.args);
    379379        }

  • trunk/src/VBox/Runtime/common/checksum/md5.cpp

    r44528 r45356  
    55
    66/*
    7  * Copyright (C) 2006-2012 Oracle Corporation
     7 * Copyright (C) 2006-2013 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    3131/*
    3232 * This code implements the MD5 message-digest algorithm.
    33  * The algorithm is due to Ron Rivest.  This code was
     33 * The algorithm is due to Ron Rivest.  This code was
    3434 * written by Colin Plumb in 1993, no copyright is claimed.
    3535 * This code is in the public domain; do with it what you wish.
    … …  
    5252#include "internal/iprt.h"
    5353
    54 #include <iprt/string.h>                /* for memcpy() */
     54#include <iprt/string.h>                /* for memcpy() */
    5555#if defined(RT_BIG_ENDIAN)
    5656# include <iprt/asm.h>                   /* RT_LE2H_U32 uses ASMByteSwapU32. */
    … …  
    240240    ctx->bits[1] += (uint32_t)(len >> 29);
    241241
    242     t = (t >> 3) & 0x3f;        /* Bytes already in shsInfo->data */
     242    t = (t >> 3) & 0x3f;        /* Bytes already in shsInfo->data */
    243243
    244244    /* Handle any leading odd-sized chunks */

  • trunk/src/VBox/Runtime/common/misc/getopt.cpp

    r45116 r45356  
    103103{
    104104    if (RT_FAILURE(RTNetStrToIPv4Addr(pszValue, pAddr)))
    105         return VERR_GETOPT_INVALID_ARGUMENT_FORMAT;
     105        return VERR_GETOPT_INVALID_ARGUMENT_FORMAT;
    106106    return VINF_SUCCESS;
    107107}
    … …  
    412412        }
    413413
    414         case RTGETOPT_REQ_IPV4CIDR:
    415         {
    416             RTNETADDRIPV4 network;
    417             RTNETADDRIPV4 netmask;
    418             if (RT_FAILURE(RTCidrStrToIPv4(pszValue, &network, &netmask)))
    419               return VERR_GETOPT_INVALID_ARGUMENT_FORMAT;
    420             pValueUnion->CidrIPv4.IPv4Network.u = network.u;
    421             pValueUnion->CidrIPv4.IPv4Netmask.u = netmask.u;
    422             break;
    423         }
     414        case RTGETOPT_REQ_IPV4CIDR:
     415        {
     416            RTNETADDRIPV4 network;
     417            RTNETADDRIPV4 netmask;
     418            if (RT_FAILURE(RTCidrStrToIPv4(pszValue, &network, &netmask)))
     419              return VERR_GETOPT_INVALID_ARGUMENT_FORMAT;
     420            pValueUnion->CidrIPv4.IPv4Network.u = network.u;
     421            pValueUnion->CidrIPv4.IPv4Netmask.u = netmask.u;
     422            break;
     423        }
    424424
    425425        case RTGETOPT_REQ_MACADDR:

  • trunk/src/VBox/Runtime/r3/haiku/time-haiku.cpp

    r43363 r45356  
    55
    66/*
    7  * Copyright (C) 2012 Oracle Corporation
     7 * Copyright (C) 2012-2013 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    4444DECLINLINE(uint64_t) rtTimeGetSystemNanoTS(void)
    4545{
    46         return (uint64_t)system_time() * 1000;
     46    return (uint64_t)system_time() * 1000;
    4747}
    4848
    … …  
    7979{
    8080    struct timeval tv;
    81         RTTimeSpecGetTimeval(pTime, &tv);
    82         set_real_time_clock(tv.tv_sec);
    83         return VINF_SUCCESS;
     81    RTTimeSpecGetTimeval(pTime, &tv);
     82    set_real_time_clock(tv.tv_sec);
     83    return VINF_SUCCESS;
    8484}

  • trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp

    r44528 r45356  
    55
    66/*
    7  * Copyright (C) 2006-2012 Oracle Corporation
     7 * Copyright (C) 2006-2013 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    254254        }
    255255
    256         RTMpOnAll(cpumR0CheckCpuid, pVM, NULL);
     256        RTMpOnAll(cpumR0CheckCpuid, pVM, NULL);
    257257    }
    258258
Note: See TracChangeset for help on using the changeset viewer.

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