Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Side by Side Diff: nspr/pr/src/linking/prlink.c

Issue 1019063003: Update to NSPR 4.10.8 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/nss.git@master
Patch Set: README bump Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « nspr/pr/src/io/prprf.c ('k') | nspr/pr/src/md/windows/w95io.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ 1 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
2 /* This Source Code Form is subject to the terms of the Mozilla Public 2 /* This Source Code Form is subject to the terms of the Mozilla Public
3 * License, v. 2.0. If a copy of the MPL was not distributed with this 3 * License, v. 2.0. If a copy of the MPL was not distributed with this
4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
5 5
6 #include "primpl.h" 6 #include "primpl.h"
7 7
8 #include <string.h> 8 #include <string.h>
9 9
10 #ifdef XP_BEOS 10 #ifdef XP_BEOS
(...skipping 1018 matching lines...) Expand 10 before | Expand all | Expand 10 after
1029 prev->next = next->next; 1029 prev->next = next->next;
1030 goto freeLib; 1030 goto freeLib;
1031 } 1031 }
1032 prev = next; 1032 prev = next;
1033 next = next->next; 1033 next = next->next;
1034 } 1034 }
1035 /* 1035 /*
1036 * fail (the library is not on the _pr_loadmap list), 1036 * fail (the library is not on the _pr_loadmap list),
1037 * but don't wipe out an error from dlclose/shl_unload. 1037 * but don't wipe out an error from dlclose/shl_unload.
1038 */ 1038 */
1039 PR_ASSERT(!"_pr_loadmap and lib->refCount inconsistent"); 1039 PR_NOT_REACHED("_pr_loadmap and lib->refCount inconsistent");
1040 if (result == 0) { 1040 if (result == 0) {
1041 PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); 1041 PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
1042 status = PR_FAILURE; 1042 status = PR_FAILURE;
1043 } 1043 }
1044 } 1044 }
1045 /* 1045 /*
1046 * We free the PRLibrary structure whether dlclose/shl_unload 1046 * We free the PRLibrary structure whether dlclose/shl_unload
1047 * succeeds or not. 1047 * succeeds or not.
1048 */ 1048 */
1049 1049
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
1599 result = PR_Malloc(strlen(module_name)+1); 1599 result = PR_Malloc(strlen(module_name)+1);
1600 if (result != NULL) { 1600 if (result != NULL) {
1601 strcpy(result, module_name); 1601 strcpy(result, module_name);
1602 } 1602 }
1603 return result; 1603 return result;
1604 #else 1604 #else
1605 PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); 1605 PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
1606 return NULL; 1606 return NULL;
1607 #endif 1607 #endif
1608 } 1608 }
OLDNEW
« no previous file with comments | « nspr/pr/src/io/prprf.c ('k') | nspr/pr/src/md/windows/w95io.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698