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

Side by Side Diff: openssl/crypto/comp/c_zlib.c

Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl/
Patch Set: '' Created 8 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « openssl/crypto/comp/c_rle.c ('k') | openssl/crypto/comp/comp_err.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 #include <stdio.h> 1 #include <stdio.h>
2 #include <stdlib.h> 2 #include <stdlib.h>
3 #include <string.h> 3 #include <string.h>
4 #include <openssl/objects.h> 4 #include <openssl/objects.h>
5 #include <openssl/comp.h> 5 #include <openssl/comp.h>
6 #include <openssl/err.h> 6 #include <openssl/err.h>
7 7
8 COMP_METHOD *COMP_zlib(void ); 8 COMP_METHOD *COMP_zlib(void );
9 9
10 static COMP_METHOD zlib_method_nozlib={ 10 static COMP_METHOD zlib_method_nozlib={
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
774 774
775 case BIO_C_DO_STATE_MACHINE: 775 case BIO_C_DO_STATE_MACHINE:
776 BIO_clear_retry_flags(b); 776 BIO_clear_retry_flags(b);
777 ret = BIO_ctrl(b->next_bio, cmd, num, ptr); 777 ret = BIO_ctrl(b->next_bio, cmd, num, ptr);
778 BIO_copy_next_retry(b); 778 BIO_copy_next_retry(b);
779 break; 779 break;
780 780
781 default: 781 default:
782 ret = BIO_ctrl(b->next_bio, cmd, num, ptr); 782 ret = BIO_ctrl(b->next_bio, cmd, num, ptr);
783 break; 783 break;
784
784 } 785 }
785 786
786 return ret; 787 return ret;
787 } 788 }
788 789
789 790
790 static long bio_zlib_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp) 791 static long bio_zlib_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)
791 { 792 {
792 if(!b->next_bio) 793 if(!b->next_bio)
793 return 0; 794 return 0;
794 return 795 return
795 BIO_callback_ctrl(b->next_bio, cmd, fp); 796 BIO_callback_ctrl(b->next_bio, cmd, fp);
796 } 797 }
797 798
798 #endif 799 #endif
OLDNEW
« no previous file with comments | « openssl/crypto/comp/c_rle.c ('k') | openssl/crypto/comp/comp_err.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698