From 3154d6cdbdcfef5373ab40fa6c08b607d4d2004d Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell@redhat.com>
Date: Tue, 31 Mar 2009 11:07:29 -1000
Subject: Revert "Work around gcc bug #492973"

This reverts commit 5a0189827c1c6db21ecbfd01f00ee1f5edbb7a77.

gcc-4.4.0-0.31 in rawhide fixes the problem we were seeing.
---
 loader/copy.c       | 2 +-
 loader/dirbrowser.c | 4 ++--
 loader/fwloader.c   | 2 +-
 loader/getparts.c   | 2 +-
 loader/loader.c     | 2 +-
 loader/net.c        | 2 +-
 loader/nfsinstall.c | 2 +-
 loader/undomounts.c | 4 ++--
 loader/urls.c       | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'loader')

diff --git a/loader/copy.c b/loader/copy.c
index 3a7a0c73b..1c612337c 100644
--- a/loader/copy.c
+++ b/loader/copy.c
@@ -63,7 +63,7 @@ int copyDirectory(char * from, char * to, void (*warnFn)(char *),
 
     errno = 0;
     while ((ent = readdir(dir))) {
-        if (!(strcmp)(ent->d_name, ".") || !(strcmp)(ent->d_name, ".."))
+        if (!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, ".."))
            continue;
 
         sprintf(filespec, "%s/%s", from, ent->d_name);
diff --git a/loader/dirbrowser.c b/loader/dirbrowser.c
index eb10c5d6f..6c713ec03 100644
--- a/loader/dirbrowser.c
+++ b/loader/dirbrowser.c
@@ -83,9 +83,9 @@ static char ** get_file_list(char * dirname,
     files = malloc(numfiles * sizeof(char *));
 
     while ((entry = readdir(dir))) {
-        if ((strlen(entry->d_name) == 1) && !(strncmp)(entry->d_name, ".", 1))
+        if ((strlen(entry->d_name) == 1) && !strncmp(entry->d_name, ".", 1))
             continue;
-        if ((strlen(entry->d_name) == 2) && !(strncmp)(entry->d_name, "..", 2))
+        if ((strlen(entry->d_name) == 2) && !strncmp(entry->d_name, "..", 2))
             continue;
         if (filterfunc && filterfunc(dirname, entry))
             continue;
diff --git a/loader/fwloader.c b/loader/fwloader.c
index f4fac38e0..2ab8c7fb4 100644
--- a/loader/fwloader.c
+++ b/loader/fwloader.c
@@ -209,7 +209,7 @@ static int get_netlink_msg(struct fw_loader *fwl, struct uevent *uevent)
         size = sizeof (buffer) - 1;
     buffer[size] = '\0';
 
-    len = (strcspn)(buffer, "@");
+    len = strcspn(buffer, "@");
     if (!buffer[len])
         return -1;
 
diff --git a/loader/getparts.c b/loader/getparts.c
index 69072291e..8d2b7c4c6 100644
--- a/loader/getparts.c
+++ b/loader/getparts.c
@@ -94,7 +94,7 @@ char **getPartitionsList(char * disk) {
 			break;
 		} else if (toknum == 2) {
 		    /* if size is exactly 1 then ignore it as an extended */
-		    if (!(strcmp)(b, "1"))
+		    if (!strcmp(b, "1"))
 			break;
 		} else if (toknum == 3) {
 		    /* this should be the partition name */
diff --git a/loader/loader.c b/loader/loader.c
index 019b2d70d..98ea24cba 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -2082,7 +2082,7 @@ int main(int argc, char ** argv) {
 
     path = getenv("PATH");
     while (path && path[0]) {
-        int n = (strcspn)(path, ":");
+        int n = strcspn(path, ":");
         char c, *binpath;
 
         c = path[n];
diff --git a/loader/net.c b/loader/net.c
index 3da4f1e36..3a3fae9d1 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -86,7 +86,7 @@ static void cidrCallback(newtComponent co, void * dptr) {
             abort();
         }
 
-        if ((strcmp)(data->ipv4, ""))
+        if (strcmp(data->ipv4, ""))
             upper = 32;
 #ifdef ENABLE_IPV6
     } else if (co == data->cidr6Entry) {
diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c
index d15e7a646..1a8154777 100644
--- a/loader/nfsinstall.c
+++ b/loader/nfsinstall.c
@@ -89,7 +89,7 @@ static int nfsGetSetup(char ** hostptr, char ** dirptr) {
     do {
         rc = newtWinEntries(_("NFS Setup"), buf, 60, 5, 15,
                             24, entries, _("OK"), _("Back"), NULL);
-    } while (!(strcmp)(newServer, "") || !(strcmp)(newDir, ""));
+    } while (!strcmp(newServer, "") || !strcmp(newDir, ""));
 
     free(buf);
     free(entries[1].text);
diff --git a/loader/undomounts.c b/loader/undomounts.c
index 68b172370..31a98bbc7 100644
--- a/loader/undomounts.c
+++ b/loader/undomounts.c
@@ -156,8 +156,8 @@ void unmountFilesystems(void) {
 	while (*chptr != ' ') chptr++;
 	*chptr++ = '\0';
 
-	if ((strcmp)(start, "/") && (strcmp)(start, "/tmp") &&
-            (strcmp)(start, "/dev")) {
+	if (strcmp(start, "/") && strcmp(start, "/tmp") &&
+            strcmp(start, "/dev")) {
 	    filesystems[numFilesystems].name = strdup(start);
 	    filesystems[numFilesystems].what = FS;
 	    filesystems[numFilesystems].mounted = 1;
diff --git a/loader/urls.c b/loader/urls.c
index 9158fa8b8..a46e0342a 100644
--- a/loader/urls.c
+++ b/loader/urls.c
@@ -136,7 +136,7 @@ static char * getLoginName(char * login, struct iurlinfo *ui) {
 char *convertUIToURL(struct iurlinfo *ui) {
     char *login, *finalPrefix, *url, *p;
 
-    if (!(strcmp)(ui->prefix, "/"))
+    if (!strcmp(ui->prefix, "/"))
 	finalPrefix = "/.";
     else
 	finalPrefix = ui->prefix;
-- 
cgit