mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 21:51:50 +00:00 
			
		
		
		
	Use Py_FatalError instead of abort.
This commit is contained in:
		
							parent
							
								
									2f7f8c4a64
								
							
						
					
					
						commit
						2863c10a86
					
				
					 2 changed files with 6 additions and 4 deletions
				
			
		|  | @ -326,7 +326,8 @@ fp_readl(char *s, int size, struct tok_state *tok) | ||||||
| { | { | ||||||
| #ifndef Py_USING_UNICODE | #ifndef Py_USING_UNICODE | ||||||
| 	/* In a non-Unicode built, this should never be called. */ | 	/* In a non-Unicode built, this should never be called. */ | ||||||
| 	abort(); | 	Py_FatalError("fp_readl should not be called in this build."); | ||||||
|  | 	return NULL; | ||||||
| #else | #else | ||||||
| 	PyObject* utf8; | 	PyObject* utf8; | ||||||
| 	PyObject* buf = tok->decoding_buffer; | 	PyObject* buf = tok->decoding_buffer; | ||||||
|  | @ -403,7 +404,7 @@ static void fp_ungetc(int c, struct tok_state *tok) { | ||||||
| static char * | static char * | ||||||
| decoding_fgets(char *s, int size, struct tok_state *tok) | decoding_fgets(char *s, int size, struct tok_state *tok) | ||||||
| { | { | ||||||
| 	char *line; | 	char *line = NULL; | ||||||
| 	int warn = 0, badchar = 0; | 	int warn = 0, badchar = 0; | ||||||
| 	for (;;) { | 	for (;;) { | ||||||
| 		if (tok->decoding_state < 0) { | 		if (tok->decoding_state < 0) { | ||||||
|  |  | ||||||
|  | @ -1186,7 +1186,8 @@ static PyObject * | ||||||
| decode_utf8(char **sPtr, char *end, char* encoding) | decode_utf8(char **sPtr, char *end, char* encoding) | ||||||
| { | { | ||||||
| #ifndef Py_USING_UNICODE | #ifndef Py_USING_UNICODE | ||||||
| 	abort(); | 	Py_FatalError("decode_utf8 should not be called in this build."); | ||||||
|  |         return NULL; | ||||||
| #else | #else | ||||||
| 	PyObject *u, *v; | 	PyObject *u, *v; | ||||||
| 	char *s, *t; | 	char *s, *t; | ||||||
|  | @ -1319,7 +1320,7 @@ parsestr(struct compiling *com, char *s) | ||||||
| #ifndef Py_USING_UNICODE | #ifndef Py_USING_UNICODE | ||||||
| 			/* This should not happen - we never see any other
 | 			/* This should not happen - we never see any other
 | ||||||
| 			   encoding. */ | 			   encoding. */ | ||||||
| 			abort(); | 			Py_FatalError("cannot deal with encodings in this build."); | ||||||
| #else | #else | ||||||
| 			PyObject* u = PyUnicode_DecodeUTF8(s, len, NULL); | 			PyObject* u = PyUnicode_DecodeUTF8(s, len, NULL); | ||||||
| 			if (u == NULL) | 			if (u == NULL) | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Martin v. Löwis
						Martin v. Löwis