Changeset 101806 in vbox for trunk/src

Timestamp:

Nov 5, 2023 9:45:21 AM (16 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

159902

Message:

libs/xpcom: Get rid of code used only if MOZ_UNICODE is defined which we never do, bugref:10545

Location:

trunk/src/libs/xpcom18a4/nsprpub/pr

Files:

• include/prio.h (modified) (7 diffs)
• include/private/primpl.h (modified) (2 diffs)
• include/prtypes.h (modified) (1 diff)
• src/pthreads/ptio.c (modified) (1 diff)

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prio.h

@@ -129 +129 @@
 typedef struct PRDir            PRDir;
 typedef struct PRDirEntry       PRDirEntry;
-#ifdef MOZ_UNICODE
-typedef struct PRDirUTF16       PRDirUTF16;
-typedef struct PRDirEntryUTF16  PRDirEntryUTF16;
-#endif /* MOZ_UNICODE */
 typedef struct PRFileDesc       PRFileDesc;
 typedef struct PRFileInfo       PRFileInfo;
@@ -740 +736 @@
     const char *name, PRIntn flags, PRIntn mode);
 
-#ifdef MOZ_UNICODE
-/*
- * EXPERIMENTAL: This function may be removed in a future release.
- */
-NSPR_API(PRFileDesc*) PR_OpenFileUTF16(
-    const PRUnichar *name, PRIntn flags, PRIntn mode);
-#endif /* MOZ_UNICODE */
-
 /*
  **************************************************************************
@@ -927 +915 @@
 NSPR_API(PRStatus) PR_GetFileInfo(const char *fn, PRFileInfo *info);
 NSPR_API(PRStatus) PR_GetFileInfo64(const char *fn, PRFileInfo64 *info);
-
-#ifdef MOZ_UNICODE
-/*
- * EXPERIMENTAL: This function may be removed in a future release.
- */
-NSPR_API(PRStatus) PR_GetFileInfo64UTF16(const PRUnichar *fn, PRFileInfo64 *info);
-#endif /* MOZ_UNICODE */
 
 /*
@@ -1089 +1070 @@
 };
 
-#ifdef MOZ_UNICODE
-struct PRDirEntryUTF16 {
-    const PRUnichar *name;   /* name of entry in UTF16, relative to
-                              * directory name */
-};
-#endif /* MOZ_UNICODE */
-
 #if !defined(NO_NSPR_10_SUPPORT)
 #define PR_DirName(dirEntry)    (dirEntry->name)
@@ -1121 +1095 @@
 
 NSPR_API(PRDir*) PR_OpenDir(const char *name);
-
-#ifdef MOZ_UNICODE
-/*
- * EXPERIMENTAL: This function may be removed in a future release.
- */
-NSPR_API(PRDirUTF16*) PR_OpenDirUTF16(const PRUnichar *name);
-#endif /* MOZ_UNICODE */
 
 /*
@@ -1162 +1129 @@
 NSPR_API(PRDirEntry*) PR_ReadDir(PRDir *dir, PRDirFlags flags);
 
-#ifdef MOZ_UNICODE
-/*
- * EXPERIMENTAL: This function may be removed in a future release.
- */
-NSPR_API(PRDirEntryUTF16*) PR_ReadDirUTF16(PRDirUTF16 *dir, PRDirFlags flags);
-#endif /* MOZ_UNICODE */
-
 /*
  *************************************************************************
@@ -1187 +1147 @@
 
 NSPR_API(PRStatus) PR_CloseDir(PRDir *dir);
-
-#ifdef MOZ_UNICODE
-/*
- * EXPERIMENTAL: This function may be removed in a future release.
- */
-NSPR_API(PRStatus) PR_CloseDirUTF16(PRDirUTF16 *dir);
-#endif /* MOZ_UNICODE */
 
 /*

trunk/src/libs/xpcom18a4/nsprpub/pr/include/private/primpl.h

@@ -134 +134 @@
 typedef struct _MDSemaphore _MDSemaphore;
 typedef struct _MDDir _MDDir;
-#ifdef MOZ_UNICODE
-typedef struct _MDDirUTF16 _MDDirUTF16;
-#endif /* MOZ_UNICODE */
 typedef struct _MDFileDesc _MDFileDesc;
 typedef struct _MDProcess _MDProcess;
@@ -543 +540 @@
     _MDDir md;
 };
-
-#ifdef MOZ_UNICODE
-struct PRDirUTF16 {
-    PRDirEntry d;
-    _MDDirUTF16 md;
-};
-#endif /* MOZ_UNICODE */
 
 extern void _PR_InitSegs(void);

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prtypes.h

@@ -492 +492 @@
 typedef enum { PR_FAILURE = -1, PR_SUCCESS = 0 } PRStatus;
 
-#ifdef MOZ_UNICODE
-/*
- * EXPERIMENTAL: This type may be removed in a future release.
- */
-#ifndef __PRUNICHAR__
-#define __PRUNICHAR__
-#if defined(WIN32) || defined(XP_MAC)
-typedef wchar_t PRUnichar;
-#else
-typedef PRUint16 PRUnichar;
-#endif
-#endif
-#endif /* MOZ_UNICODE */
-
 /*
 ** WARNING: The undocumented data types PRWord and PRUword are

trunk/src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptio.c

@@ -4179 +4179 @@
 }
 
-#ifdef MOZ_UNICODE
-/* ================ UTF16 Interfaces ================================ */
-PR_IMPLEMENT(PRFileDesc*) PR_OpenFileUTF16(
-    const PRUnichar *name, PRIntn flags, PRIntn mode)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return NULL;
-}
-
-PR_IMPLEMENT(PRStatus) PR_CloseDirUTF16(PRDir *dir)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-
-PR_IMPLEMENT(PRDirUTF16*) PR_OpenDirUTF16(const PRUnichar *name)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return NULL;
-}
-
-PR_IMPLEMENT(PRDirEntryUTF16*) PR_ReadDirUTF16(PRDirUTF16 *dir, PRDirFlags flags)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return NULL;
-}
-
-PR_IMPLEMENT(PRStatus) PR_GetFileInfo64UTF16(const PRUnichar *fn, PRFileInfo64 *info)
-{
-    PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
-    return PR_FAILURE;
-}
-/* ================ UTF16 Interfaces ================================ */
-#endif /* MOZ_UNICODE */
-
 /* ptio.c */