mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 10:47:18 +00:00 
			
		
		
		
	import gcc 4.3.2 warning fixes from trunk, with a few changes specific to this branch
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153710 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -79,7 +79,9 @@ static int read_environment(void) | ||||
| 	char *val; | ||||
| 	/* Read environment */ | ||||
| 	for(;;) { | ||||
| 		fgets(buf, sizeof(buf), stdin); | ||||
| 		if (!fgets(buf, sizeof(buf), stdin)) { | ||||
| 			return -1; | ||||
| 		} | ||||
| 		if (feof(stdin)) | ||||
| 			return -1; | ||||
| 		buf[strlen(buf) - 1] = '\0'; | ||||
| @@ -130,7 +132,9 @@ static char *wait_result(void) | ||||
| 			return NULL; | ||||
| 		} | ||||
| 		if (FD_ISSET(STDIN_FILENO, &fds)) { | ||||
| 			fgets(astresp, sizeof(astresp), stdin); | ||||
| 			if (!fgets(astresp, sizeof(astresp), stdin)) { | ||||
| 				return NULL; | ||||
| 			} | ||||
| 			if (feof(stdin)) { | ||||
| 				fprintf(stderr, "Got hungup on apparently\n"); | ||||
| 				return NULL; | ||||
| @@ -141,9 +145,10 @@ static char *wait_result(void) | ||||
| 		} | ||||
| 		if (FD_ISSET(AUDIO_FILENO, &fds)) { | ||||
| 			res = read(AUDIO_FILENO, audiobuf, sizeof(audiobuf)); | ||||
| 			if (res > 0) { | ||||
| 				if (sphinx_sock > -1)  | ||||
| 					write(sphinx_sock, audiobuf, res); | ||||
| 			if ((res > 0) && (sphinx_sock > -1)) { | ||||
| 				if (write(sphinx_sock, audiobuf, res) < 0) { | ||||
| 					fprintf(stderr, "write() failed: %s\n", strerror(errno)); | ||||
| 				} | ||||
| 			} | ||||
| 		} | ||||
| 		if ((sphinx_sock > -1) && FD_ISSET(sphinx_sock, &fds)) { | ||||
|   | ||||
| @@ -24,7 +24,9 @@ static int read_environment(void) | ||||
| 	char *val; | ||||
| 	/* Read environment */ | ||||
| 	for(;;) { | ||||
| 		fgets(buf, sizeof(buf), stdin); | ||||
| 		if (!fgets(buf, sizeof(buf), stdin)) { | ||||
| 			return -1; | ||||
| 		} | ||||
| 		if (feof(stdin)) | ||||
| 			return -1; | ||||
| 		buf[strlen(buf) - 1] = '\0'; | ||||
| @@ -68,7 +70,9 @@ static char *wait_result(void) | ||||
| 			return NULL; | ||||
| 		} | ||||
| 		if (FD_ISSET(STDIN_FILENO, &fds)) { | ||||
| 			fgets(astresp, sizeof(astresp), stdin); | ||||
| 			if (!fgets(astresp, sizeof(astresp), stdin)) { | ||||
| 				return NULL; | ||||
| 			} | ||||
| 			if (feof(stdin)) { | ||||
| 				fprintf(stderr, "Got hungup on apparently\n"); | ||||
| 				return NULL; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user