Attachment #84821 for issue #125194

View | Details | Raw Unified | Return to issue 125194
Collapse All | Expand All

Lines 132-137 typedef enum { Link Here

(-)a/main/sal/inc/osl/file.h (+1 lines)
132	osl_File_E_USERS,	132	osl_File_E_USERS,
133	osl_File_E_OVERFLOW,	133	osl_File_E_OVERFLOW,
134	osl_File_E_NOTREADY,	134	osl_File_E_NOTREADY,
		135	osl_File_E_LOCKED,
135	osl_File_E_invalidError, /* unmapped error: always last entry in enum! */	136	osl_File_E_invalidError, /* unmapped error: always last entry in enum! */
136	osl_File_E_TIMEDOUT,	137	osl_File_E_TIMEDOUT,
137	osl_File_E_NETWORK,	138	osl_File_E_NETWORK,

Lines 99-104 public: Link Here

(-)a/main/sal/inc/osl/file.hxx (+1 lines)
99	E_USERS = osl_File_E_USERS,	99	E_USERS = osl_File_E_USERS,
100	E_OVERFLOW = osl_File_E_OVERFLOW,	100	E_OVERFLOW = osl_File_E_OVERFLOW,
101	E_NOTREADY = osl_File_E_NOTREADY,	101	E_NOTREADY = osl_File_E_NOTREADY,
		102	E_LOCKED = osl_File_E_LOCKED,
102	E_invalidError = osl_File_E_invalidError, /* unmapped error: always last entry in enum! */	103	E_invalidError = osl_File_E_invalidError, /* unmapped error: always last entry in enum! */
103	E_TIMEDOUT = osl_File_E_TIMEDOUT,	104	E_TIMEDOUT = osl_File_E_TIMEDOUT,
104	E_NETWORK = osl_File_E_NETWORK	105	E_NETWORK = osl_File_E_NETWORK

Lines 87-93 static const struct osl_file_error_entry errtable[] = { Link Here

(-)a/main/sal/osl/w32/file_error.c (-1 / +3 lines)
87	{ ERROR_NESTING_NOT_ALLOWED, osl_File_E_AGAIN }, /* 215 */	87	{ ERROR_NESTING_NOT_ALLOWED, osl_File_E_AGAIN }, /* 215 */
88	{ ERROR_DIRECTORY, osl_File_E_NOENT }, /* 267 */	88	{ ERROR_DIRECTORY, osl_File_E_NOENT }, /* 267 */
89	{ ERROR_NOT_ENOUGH_QUOTA, osl_File_E_NOMEM }, /* 1816 */	89	{ ERROR_NOT_ENOUGH_QUOTA, osl_File_E_NOMEM }, /* 1816 */
90	{ ERROR_UNEXP_NET_ERR, osl_File_E_NETWORK } /* 59 */	90	{ ERROR_UNEXP_NET_ERR, osl_File_E_NETWORK }, /* 59 */
		91	{ ERROR_FILE_CHECKED_OUT, osl_File_E_LOCKED }, /* 220 The file is locked or checked out by another user. */
		92	{ ERROR_INVALID_NAME, osl_File_E_NOENT } /* 123 One or more of the names composing the file path has a wrong syntax. */
91	};	93	};
92		94
93	/* The following two constants must be the minimum and maximum	95	/* The following two constants must be the minimum and maximum

Lines 368-373 namespace fileaccess { Link Here

(-)a/main/ucb/source/ucp/file/filglob.cxx (-1 / +4 lines)
368	ioErrorCode = IOErrorCode_LOCKING_VIOLATION;	368	ioErrorCode = IOErrorCode_LOCKING_VIOLATION;
369	break;	369	break;
370		370
		371	case FileBase::E_LOCKED: // file is locked by another user
		372	ioErrorCode = IOErrorCode_LOCKING_VIOLATION;
		373	break;
		374
371	case FileBase::E_FAULT: // Bad address	375	case FileBase::E_FAULT: // Bad address
372	case FileBase::E_LOOP: // Too many symbolic links encountered	376	case FileBase::E_LOOP: // Too many symbolic links encountered
373	case FileBase::E_NOSPC: // No space left on device	377	case FileBase::E_NOSPC: // No space left on device
374	-

Return to issue 125194