summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/etags.c4
-rw-r--r--lib-src/pop.c10
2 files changed, 5 insertions, 9 deletions
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 036c485d0bb..6409407e466 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -1146,7 +1146,6 @@ main (int argc, char **argv)
{
error ("-o option may only be given once.");
suggest_asking_for_help ();
- /* NOTREACHED */
}
tagfile = optarg;
break;
@@ -1208,7 +1207,6 @@ main (int argc, char **argv)
case 'w': no_warnings = true; break;
default:
suggest_asking_for_help ();
- /* NOTREACHED */
}
/* No more options. Store the rest of arguments. */
@@ -1227,13 +1225,11 @@ main (int argc, char **argv)
if (help_asked)
print_help (argbuffer);
- /* NOTREACHED */
if (nincluded_files == 0 && file_count == 0)
{
error ("no input files specified.");
suggest_asking_for_help ();
- /* NOTREACHED */
}
if (tagfile == NULL)
diff --git a/lib-src/pop.c b/lib-src/pop.c
index e4bd6c04965..9a0dd8ca704 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1275,7 +1275,7 @@ pop_getline (popserver server, char **line)
server->buffer_index = 0;
}
- while (1)
+ while (true)
{
/* There's a "- 1" here to leave room for the null that we put
at the end of the read data below. We put the null there so
@@ -1288,7 +1288,7 @@ pop_getline (popserver server, char **line)
{
strcpy (pop_error, "Out of memory in pop_getline");
pop_trash (server);
- return (-1);
+ break;
}
}
ret = RECV (server->file, server->buffer + server->data,
@@ -1298,13 +1298,13 @@ pop_getline (popserver server, char **line)
snprintf (pop_error, ERROR_MAX, "%s%s",
GETLINE_ERROR, strerror (errno));
pop_trash (server);
- return (-1);
+ break;
}
else if (ret == 0)
{
strcpy (pop_error, "Unexpected EOF from server in pop_getline");
pop_trash (server);
- return (-1);
+ break;
}
else
{
@@ -1332,7 +1332,7 @@ pop_getline (popserver server, char **line)
}
}
- /* NOTREACHED */
+ return -1;
}
/*