← Back to branch summary

~ubuntu-branches/ubuntu/trusty/virtualbox-ose/trusty

« back to all changes in this revision

Viewing changes to src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h
28
28
 * additional information or have any questions.
29
29
 */
30
30
 
 
31
 
31
32
/*******************************************************************************
32
33
*   Defined Constants And Macros                                               *
33
34
*******************************************************************************/
487
488
                 * Call back.
488
489
                 */
489
490
                AssertMsgReturn(Value == (RTUINTPTR)Value, (FMT_ELF_ADDR "\n", Value), VERR_SYMBOL_VALUE_TOO_BIG);
490
 
                int rc = pfnCallback(pMod, pszName, ~0, (RTUINTPTR)Value, pvUser);
 
491
                rc = pfnCallback(pMod, pszName, ~0, (RTUINTPTR)Value, pvUser);
491
492
                if (rc)
492
493
                    return rc;
493
494
            }
871
872
        /* read by for byte. */
872
873
        for (unsigned i = 0; i < cbName; i++, off++)
873
874
        {
874
 
            int rc = pModElf->pReader->pfnRead(pModElf->pReader, pszName + i, 1, off);
 
875
            rc = pModElf->pReader->pfnRead(pModElf->pReader, pszName + i, 1, off);
875
876
            if (RT_FAILURE(rc))
876
877
            {
877
878
                pszName[i] = '\0';
1024
1025
    int rc = pReader->pfnRead(pReader, &pModElf->Ehdr, sizeof(pModElf->Ehdr), 0);
1025
1026
    if (RT_SUCCESS(rc))
1026
1027
    {
1027
 
        RTLDRARCH enmArchImage;
 
1028
        RTLDRARCH enmArchImage = RTLDRARCH_INVALID; /* shut up gcc */
1028
1029
        rc = RTLDRELF_NAME(ValidateElfHeader)(&pModElf->Ehdr, pszLogName, cbRawImage, &enmArchImage);
1029
1030
        if (RT_SUCCESS(rc))
1030
1031
        {