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

Side by Side Diff: source/libvpx/build/make/obj_int_extract.c

Issue 111463005: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years 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 | Annotate | Revision Log
« no previous file with comments | « source/libvpx/build/make/gen_msvs_vcxproj.sh ('k') | source/libvpx/build/make/thumb.pm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 ENDIAN_ASSIGN_IN_PLACE(hdr64->sh_info); 314 ENDIAN_ASSIGN_IN_PLACE(hdr64->sh_info);
315 ENDIAN_ASSIGN_IN_PLACE(hdr64->sh_addralign); 315 ENDIAN_ASSIGN_IN_PLACE(hdr64->sh_addralign);
316 ENDIAN_ASSIGN_IN_PLACE(hdr64->sh_entsize); 316 ENDIAN_ASSIGN_IN_PLACE(hdr64->sh_entsize);
317 } 317 }
318 318
319 return 0; 319 return 0;
320 bail: 320 bail:
321 return 1; 321 return 1;
322 } 322 }
323 323
324 char *parse_elf_string_table(elf_obj_t *elf, int s_idx, int idx) { 324 const char *parse_elf_string_table(elf_obj_t *elf, int s_idx, int idx) {
325 if (elf->bits == 32) { 325 if (elf->bits == 32) {
326 Elf32_Shdr shdr; 326 Elf32_Shdr shdr;
327 327
328 if (parse_elf_section(elf, s_idx, &shdr, NULL)) { 328 if (parse_elf_section(elf, s_idx, &shdr, NULL)) {
329 log_msg("Failed to parse ELF string table: section %d, index %d\n", 329 log_msg("Failed to parse ELF string table: section %d, index %d\n",
330 s_idx, idx); 330 s_idx, idx);
331 return ""; 331 return "";
332 } 332 }
333 333
334 return (char *)(elf->buf + shdr.sh_offset + idx); 334 return (char *)(elf->buf + shdr.sh_offset + idx);
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
818 #endif 818 #endif
819 819
820 free(file_buf); 820 free(file_buf);
821 821
822 if (!res) 822 if (!res)
823 return EXIT_SUCCESS; 823 return EXIT_SUCCESS;
824 824
825 bail: 825 bail:
826 return EXIT_FAILURE; 826 return EXIT_FAILURE;
827 } 827 }
OLDNEW
« no previous file with comments | « source/libvpx/build/make/gen_msvs_vcxproj.sh ('k') | source/libvpx/build/make/thumb.pm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698