diff options
| -rw-r--r-- | lib/messages.c | 4 | ||||
| -rw-r--r-- | lib/query.c | 2 | ||||
| -rw-r--r-- | lib/rpmchecksig.c | 2 | ||||
| -rw-r--r-- | lib/url.c | 3 | ||||
| -rw-r--r-- | rpmio/messages.c | 4 |
5 files changed, 8 insertions, 7 deletions
diff --git a/lib/messages.c b/lib/messages.c index ee6f7c1ef..e968247ec 100644 --- a/lib/messages.c +++ b/lib/messages.c @@ -64,14 +64,14 @@ void rpmMessage(int level, const char * format, ...) { vfprintf(stderr, format, args); fflush(stderr); exit(EXIT_FAILURE); - /*@unreached@*/ break; + /*@notreached@*/ break; default: fprintf(stderr, _("internal error (rpm bug?): ")); vfprintf(stderr, format, args); fflush(stderr); exit(EXIT_FAILURE); - /*@unreached@*/ break; + /*@notreached@*/ break; } } diff --git a/lib/query.c b/lib/query.c index 3230c93cb..439e3a2d7 100644 --- a/lib/query.c +++ b/lib/query.c @@ -329,7 +329,7 @@ printNewSpecfile(Spec spec) sprintf(buf, "%s(%s)", n, tagName(t->t_tag)); t->t_msgid = xstrdup(buf); } - msgstr = xstrdup(dgettext(specedit, t->t_msgid)); + msgstr = xstrdup(/*@-unrecog@*/ dgettext(specedit, t->t_msgid) /*@=unrecog@*/); switch(t->t_tag) { case RPMTAG_SUMMARY: diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c index fb3b99436..0a18f57dc 100644 --- a/lib/rpmchecksig.c +++ b/lib/rpmchecksig.c @@ -156,7 +156,7 @@ int rpmReSign(int add, char *passPhrase, const char **argv) /* Write the lead/signature of the output rpm */ strcpy(tmprpm, rpm); strcat(tmprpm, ".XXXXXX"); - mktemp(tmprpm); + /*@-unrecog@*/ mktemp(tmprpm) /*@=unrecog@*/; trpm = tmprpm; if (manageFile(&ofd, &trpm, O_WRONLY|O_CREAT|O_TRUNC, 0)) @@ -287,7 +287,8 @@ int urlSplit(const char * url, urlinfo **uret) if (u->port < 0 && u->service != NULL) { struct servent *serv; - if ((serv = getservbyname(u->service, "tcp")) != NULL) + serv = /*@-unrecog@*/ getservbyname(u->service, "tcp") /*@=unrecog@*/; + if (serv != NULL) u->port = ntohs(serv->s_port); else if (!strcasecmp(u->service, "ftp")) u->port = IPPORT_FTP; diff --git a/rpmio/messages.c b/rpmio/messages.c index ee6f7c1ef..e968247ec 100644 --- a/rpmio/messages.c +++ b/rpmio/messages.c @@ -64,14 +64,14 @@ void rpmMessage(int level, const char * format, ...) { vfprintf(stderr, format, args); fflush(stderr); exit(EXIT_FAILURE); - /*@unreached@*/ break; + /*@notreached@*/ break; default: fprintf(stderr, _("internal error (rpm bug?): ")); vfprintf(stderr, format, args); fflush(stderr); exit(EXIT_FAILURE); - /*@unreached@*/ break; + /*@notreached@*/ break; } } |