VirtualBox

Changeset 76421 in vbox


Ignore:
Timestamp:
Dec 23, 2018 8:06:07 PM (6 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
127722
Message:

VBox/shflsvc.h: Use errcore.h rather than err.h. bugref:9344

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/VBox/shflsvc.h

    r76408 r76421  
    4040#include <iprt/fs.h>
    4141#include <iprt/assert.h>
    42 #include <iprt/err.h>
     42#include <iprt/errcore.h>
    4343#if defined(IN_RING3) || (defined(IN_RING0) && defined(RT_OS_DARWIN))
    4444# include <iprt/mem.h>
  • trunk/include/iprt/errcore.h

    r76417 r76421  
    3636 * @{
    3737 */
    38 
    39 /* We duplicate a handful of very commonly used status codes from err.h here.
    40    Needless to say, these needs to match the err.h definition exactly: */
    41 
    42 /** Success.
    43  * @ingroup grp_rt_err  */
    44 #define VINF_SUCCESS                        0
    45 
    46 /** General failure - DON'T USE THIS!!!
    47  * @ingroup grp_rt_err */
    48 #define VERR_GENERAL_FAILURE                (-1)
    49 /** Invalid parameter.
    50  * @ingroup grp_rt_err */
    51 #define VERR_INVALID_PARAMETER              (-2)
    52 /** Invalid parameter.
    53  * @ingroup grp_rt_err */
    54 #define VWRN_INVALID_PARAMETER              2
    55 /** Invalid magic or cookie.
    56  * @ingroup grp_rt_err */
    57 #define VERR_INVALID_MAGIC                  (-3)
    58 /** Invalid magic or cookie.
    59  * @ingroup grp_rt_err */
    60 #define VWRN_INVALID_MAGIC                  3
    61 /** Invalid loader handle.
    62  * @ingroup grp_rt_err */
    63 #define VERR_INVALID_HANDLE                 (-4)
    64 /** Invalid loader handle.
    65  * @ingroup grp_rt_err */
    66 #define VWRN_INVALID_HANDLE                 4
    67 /** Invalid memory pointer. */
    68 #define VERR_INVALID_POINTER                (-6)
    69 /** Memory allocation failed.
    70  * @ingroup grp_rt_err */
    71 #define VERR_NO_MEMORY                      (-8)
    72 /** Permission denied.
    73  * @ingroup grp_rt_err */
    74 #define VERR_PERMISSION_DENIED              (-10)
    75 /** Permission denied.
    76  * @ingroup grp_rt_err */
    77 #define VINF_PERMISSION_DENIED              10
    78 /** Version mismatch.
    79  * @ingroup grp_rt_err */
    80 #define VERR_VERSION_MISMATCH               (-11)
    81 /** The request function is not implemented.
    82  * @ingroup grp_rt_err */
    83 #define VERR_NOT_IMPLEMENTED                (-12)
    84 /** Invalid flags was given.
    85  * @ingroup grp_rt_err */
    86 #define VERR_INVALID_FLAGS                  (-13)
    87 /** Invalid function.
    88  * @ingroup grp_rt_err */
    89 #define VERR_INVALID_FUNCTION               (-36)
    90 /** Not supported.
    91  * @ingroup grp_rt_err */
    92 #define VERR_NOT_SUPPORTED                  (-37)
    93 /** Not supported.
    94  * @ingroup grp_rt_err */
    95 #define VINF_NOT_SUPPORTED                  37
    96 /** Access denied.
    97  * @ingroup grp_rt_err */
    98 #define VERR_ACCESS_DENIED                  (-38)
    99 /** Call interrupted.
    100  * @ingroup grp_rt_err */
    101 #define VERR_INTERRUPTED                    (-39)
    102 /** Call interrupted.
    103  * @ingroup grp_rt_err */
    104 #define VINF_INTERRUPTED                    39
    105 /** Timeout.
    106  * @ingroup grp_rt_err */
    107 #define VERR_TIMEOUT                        (-40)
    108 /** Timeout.
    109  * @ingroup grp_rt_err */
    110 #define VINF_TIMEOUT                        40
    111 /** Buffer too small to save result.
    112  * @ingroup grp_rt_err */
    113 #define VERR_BUFFER_OVERFLOW                (-41)
    114 /** Buffer too small to save result.
    115  * @ingroup grp_rt_err */
    116 #define VINF_BUFFER_OVERFLOW                41
    117 /** The operation was cancelled by the user (copy) or another thread (local ipc).
    118  * @ingroup grp_rt_err */
    119 #define VERR_CANCELLED                      (-70)
    120 /** Trailing characters.
    121  * @ingroup grp_rt_err */
    122 #define VERR_TRAILING_CHARS                 (-76)
    123 /** Trailing characters.
    124  * @ingroup grp_rt_err */
    125 #define VWRN_TRAILING_CHARS                 76
    126 /** Trailing spaces.
    127  * @ingroup grp_rt_err */
    128 #define VERR_TRAILING_SPACES                (-77)
    129 /** Trailing spaces.
    130  * @ingroup grp_rt_err */
    131 #define VWRN_TRAILING_SPACES                77
    132 /** Generic not found error.
    133  * @ingroup grp_rt_err */
    134 #define VERR_NOT_FOUND                      (-78)
    135 /** Generic not found warning.
    136  * @ingroup grp_rt_err */
    137 #define VWRN_NOT_FOUND                      78
    138 /** Generic invalid state error.
    139  * @ingroup grp_rt_err */
    140 #define VERR_INVALID_STATE                  (-79)
    141 /** Generic invalid state warning.
    142  * @ingroup grp_rt_err */
    143 #define VWRN_INVALID_STATE                  79
    144 /** Generic out of resources error.
    145  * @ingroup grp_rt_err */
    146 #define VERR_OUT_OF_RESOURCES               (-80)
    147 /** Generic out of resources warning.
    148  * @ingroup grp_rt_err */
    149 #define VWRN_OUT_OF_RESOURCES               80
    150 /** End of string.
    151  * @ingroup grp_rt_err */
    152 #define VERR_END_OF_STRING                  (-83)
    153 /** Duplicate something.
    154  * @ingroup grp_rt_err */
    155 #define VERR_DUPLICATE                      (-98)
    156 /** Something is missing.
    157  * @ingroup grp_rt_err */
    158 #define VERR_MISSING                        (-99)
    159 /** Buffer underflow.
    160  * @ingroup grp_rt_err */
    161 #define VERR_BUFFER_UNDERFLOW               (-22401)
    162 /** Buffer underflow.
    163  * @ingroup grp_rt_err */
    164 #define VINF_BUFFER_UNDERFLOW               22401
    165 /** Something is not available or not working properly.
    166  * @ingroup grp_rt_err */
    167 #define VERR_NOT_AVAILABLE                  (-22403)
    168 /** Mismatch.
    169  * @ingroup grp_rt_err */
    170 #define VERR_MISMATCH                       (-22408)
    171 /** Wrong type.
    172  * @ingroup grp_rt_err */
    173 #define VERR_WRONG_TYPE                     (-22409)
    174 /** Wrong type.
    175  * @ingroup grp_rt_err */
    176 #define VWRN_WRONG_TYPE                     (22409)
    177 /** Wrong parameter count.
    178  * @ingroup grp_rt_err */
    179 #define VERR_WRONG_PARAMETER_COUNT          (-22415)
    180 /** Wrong parameter type.
    181  * @ingroup grp_rt_err */
    182 #define VERR_WRONG_PARAMETER_TYPE           (-22416)
    183 /** Invalid client ID.
    184  * @ingroup grp_rt_err */
    185 #define VERR_INVALID_CLIENT_ID              (-22417)
    186 /** Invalid session ID.
    187  * @ingroup grp_rt_err */
    188 #define VERR_INVALID_SESSION_ID             (-22418)
    189 /** Incompatible configuration requested.
    190  * @ingroup grp_rt_err */
    191 #define VERR_INCOMPATIBLE_CONFIG            (-22420)
    192 /** Internal error - this should never happen.
    193  * @ingroup grp_rt_err */
    194 #define VERR_INTERNAL_ERROR                 (-225)
    195 
    196 
    19738
    19839/** @def RTERR_STRICT_RC
     
    913754RT_C_DECLS_END
    914755
     756
     757/* We duplicate a handful of very commonly used status codes from err.h here.
     758   Needless to say, these needs to match the err.h definition exactly: */
     759
     760/** Success.
     761 * @ingroup grp_rt_err  */
     762#define VINF_SUCCESS                        0
     763
     764/** General failure - DON'T USE THIS!!!
     765 * @ingroup grp_rt_err */
     766#define VERR_GENERAL_FAILURE                (-1)
     767/** Invalid parameter.
     768 * @ingroup grp_rt_err */
     769#define VERR_INVALID_PARAMETER              (-2)
     770/** Invalid parameter.
     771 * @ingroup grp_rt_err */
     772#define VWRN_INVALID_PARAMETER              2
     773/** Invalid magic or cookie.
     774 * @ingroup grp_rt_err */
     775#define VERR_INVALID_MAGIC                  (-3)
     776/** Invalid magic or cookie.
     777 * @ingroup grp_rt_err */
     778#define VWRN_INVALID_MAGIC                  3
     779/** Invalid loader handle.
     780 * @ingroup grp_rt_err */
     781#define VERR_INVALID_HANDLE                 (-4)
     782/** Invalid loader handle.
     783 * @ingroup grp_rt_err */
     784#define VWRN_INVALID_HANDLE                 4
     785/** Invalid memory pointer. */
     786#define VERR_INVALID_POINTER                (-6)
     787/** Memory allocation failed.
     788 * @ingroup grp_rt_err */
     789#define VERR_NO_MEMORY                      (-8)
     790/** Permission denied.
     791 * @ingroup grp_rt_err */
     792#define VERR_PERMISSION_DENIED              (-10)
     793/** Permission denied.
     794 * @ingroup grp_rt_err */
     795#define VINF_PERMISSION_DENIED              10
     796/** Version mismatch.
     797 * @ingroup grp_rt_err */
     798#define VERR_VERSION_MISMATCH               (-11)
     799/** The request function is not implemented.
     800 * @ingroup grp_rt_err */
     801#define VERR_NOT_IMPLEMENTED                (-12)
     802/** Invalid flags was given.
     803 * @ingroup grp_rt_err */
     804#define VERR_INVALID_FLAGS                  (-13)
     805/** Invalid function.
     806 * @ingroup grp_rt_err */
     807#define VERR_INVALID_FUNCTION               (-36)
     808/** Not supported.
     809 * @ingroup grp_rt_err */
     810#define VERR_NOT_SUPPORTED                  (-37)
     811/** Not supported.
     812 * @ingroup grp_rt_err */
     813#define VINF_NOT_SUPPORTED                  37
     814/** Access denied.
     815 * @ingroup grp_rt_err */
     816#define VERR_ACCESS_DENIED                  (-38)
     817/** Call interrupted.
     818 * @ingroup grp_rt_err */
     819#define VERR_INTERRUPTED                    (-39)
     820/** Call interrupted.
     821 * @ingroup grp_rt_err */
     822#define VINF_INTERRUPTED                    39
     823/** Timeout.
     824 * @ingroup grp_rt_err */
     825#define VERR_TIMEOUT                        (-40)
     826/** Timeout.
     827 * @ingroup grp_rt_err */
     828#define VINF_TIMEOUT                        40
     829/** Buffer too small to save result.
     830 * @ingroup grp_rt_err */
     831#define VERR_BUFFER_OVERFLOW                (-41)
     832/** Buffer too small to save result.
     833 * @ingroup grp_rt_err */
     834#define VINF_BUFFER_OVERFLOW                41
     835/** Data size overflow.
     836 * @ingroup grp_rt_err */
     837#define VERR_TOO_MUCH_DATA                  (-42)
     838/** The operation was cancelled by the user (copy) or another thread (local ipc).
     839 * @ingroup grp_rt_err */
     840#define VERR_CANCELLED                      (-70)
     841/** Trailing characters.
     842 * @ingroup grp_rt_err */
     843#define VERR_TRAILING_CHARS                 (-76)
     844/** Trailing characters.
     845 * @ingroup grp_rt_err */
     846#define VWRN_TRAILING_CHARS                 76
     847/** Trailing spaces.
     848 * @ingroup grp_rt_err */
     849#define VERR_TRAILING_SPACES                (-77)
     850/** Trailing spaces.
     851 * @ingroup grp_rt_err */
     852#define VWRN_TRAILING_SPACES                77
     853/** Generic not found error.
     854 * @ingroup grp_rt_err */
     855#define VERR_NOT_FOUND                      (-78)
     856/** Generic not found warning.
     857 * @ingroup grp_rt_err */
     858#define VWRN_NOT_FOUND                      78
     859/** Generic invalid state error.
     860 * @ingroup grp_rt_err */
     861#define VERR_INVALID_STATE                  (-79)
     862/** Generic invalid state warning.
     863 * @ingroup grp_rt_err */
     864#define VWRN_INVALID_STATE                  79
     865/** Generic out of resources error.
     866 * @ingroup grp_rt_err */
     867#define VERR_OUT_OF_RESOURCES               (-80)
     868/** Generic out of resources warning.
     869 * @ingroup grp_rt_err */
     870#define VWRN_OUT_OF_RESOURCES               80
     871/** End of string.
     872 * @ingroup grp_rt_err */
     873#define VERR_END_OF_STRING                  (-83)
     874/** Duplicate something.
     875 * @ingroup grp_rt_err */
     876#define VERR_DUPLICATE                      (-98)
     877/** Something is missing.
     878 * @ingroup grp_rt_err */
     879#define VERR_MISSING                        (-99)
     880/** Buffer underflow.
     881 * @ingroup grp_rt_err */
     882#define VERR_BUFFER_UNDERFLOW               (-22401)
     883/** Buffer underflow.
     884 * @ingroup grp_rt_err */
     885#define VINF_BUFFER_UNDERFLOW               22401
     886/** Something is not available or not working properly.
     887 * @ingroup grp_rt_err */
     888#define VERR_NOT_AVAILABLE                  (-22403)
     889/** Mismatch.
     890 * @ingroup grp_rt_err */
     891#define VERR_MISMATCH                       (-22408)
     892/** Wrong type.
     893 * @ingroup grp_rt_err */
     894#define VERR_WRONG_TYPE                     (-22409)
     895/** Wrong type.
     896 * @ingroup grp_rt_err */
     897#define VWRN_WRONG_TYPE                     (22409)
     898/** Wrong parameter count.
     899 * @ingroup grp_rt_err */
     900#define VERR_WRONG_PARAMETER_COUNT          (-22415)
     901/** Wrong parameter type.
     902 * @ingroup grp_rt_err */
     903#define VERR_WRONG_PARAMETER_TYPE           (-22416)
     904/** Invalid client ID.
     905 * @ingroup grp_rt_err */
     906#define VERR_INVALID_CLIENT_ID              (-22417)
     907/** Invalid session ID.
     908 * @ingroup grp_rt_err */
     909#define VERR_INVALID_SESSION_ID             (-22418)
     910/** Incompatible configuration requested.
     911 * @ingroup grp_rt_err */
     912#define VERR_INCOMPATIBLE_CONFIG            (-22420)
     913/** Internal error - this should never happen.
     914 * @ingroup grp_rt_err */
     915#define VERR_INTERNAL_ERROR                 (-225)
     916
     917
    915918/** @} */
    916919
  • trunk/src/VBox/HostServices/SharedFolders/testcase/tstShflCase.cpp

    r69753 r76421  
    2323#include <VBox/shflsvc.h>
    2424#include <VBox/log.h>
    25 #include <iprt/alloc.h>
    2625#include <iprt/assert.h>
     26#include <iprt/err.h>
    2727#include <iprt/file.h>
    2828#include <iprt/fs.h>
    2929#include <iprt/dir.h>
    3030#include <iprt/initterm.h>
     31#include <iprt/mem.h>
    3132#include <iprt/path.h>
    3233#include <iprt/string.h>
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