← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/Runtime/common/string/strstrip.cpp

  • 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/string/strstrip.cpp
28
28
 * additional information or have any questions.
29
29
 */
30
30
 
 
31
 
31
32
/*******************************************************************************
32
33
*   Header Files                                                               *
33
34
*******************************************************************************/
34
35
#include <iprt/string.h>
 
36
#include "internal/iprt.h"
 
37
 
35
38
#include <iprt/ctype.h>
36
39
#include <iprt/string.h>
37
40
 
45
48
RTDECL(char *) RTStrStrip(char *psz)
46
49
{
47
50
    /* left */
48
 
    while (isspace(*psz))
 
51
    while (RT_C_IS_SPACE(*psz))
49
52
        psz++;
50
53
 
51
54
    /* right */
52
55
    char *pszEnd = strchr(psz, '\0');
53
 
    while (--pszEnd > psz && isspace(*pszEnd))
 
56
    while (--pszEnd > psz && RT_C_IS_SPACE(*pszEnd))
54
57
        *pszEnd = '\0';
55
58
 
56
59
    return psz;
57
60
}
 
61
RT_EXPORT_SYMBOL(RTStrStrip);
58
62
 
59
63
 
60
64
/**
66
70
RTDECL(char *) RTStrStripL(const char *psz)
67
71
{
68
72
    /* left */
69
 
    while (isspace(*psz))
 
73
    while (RT_C_IS_SPACE(*psz))
70
74
        psz++;
71
75
 
72
76
    return (char *)psz;
73
77
}
 
78
RT_EXPORT_SYMBOL(RTStrStripL);
74
79
 
75
80
 
76
81
/**
83
88
{
84
89
    /* right */
85
90
    char *pszEnd = strchr(psz, '\0');
86
 
    while (--pszEnd > psz && isspace(*pszEnd))
 
91
    while (--pszEnd > psz && RT_C_IS_SPACE(*pszEnd))
87
92
        *pszEnd = '\0';
88
93
 
89
94
    return psz;
90
95
}
 
96
RT_EXPORT_SYMBOL(RTStrStripR);
91
97