summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-01-23 08:35:15 +0000
committerJeremy Allison <jra@samba.org>1998-01-23 08:35:15 +0000
commit46c795da5d8b7d46e0e2806b86c97a3e2b34be26 (patch)
treeeb9116000b163f0396eaf78fa0016fb81d5d8094
parent458a678fd2bdd3345b37765cc6de5702c917ab50 (diff)
downloadsamba-46c795da5d8b7d46e0e2806b86c97a3e2b34be26.tar.gz
samba-46c795da5d8b7d46e0e2806b86c97a3e2b34be26.tar.bz2
samba-46c795da5d8b7d46e0e2806b86c97a3e2b34be26.zip
Fixed warnings with gcc (assignments inside if statements).
Jeremy. (This used to be commit 1a9e25d3bc610a1d49241e2fe39530813d983882)
-rw-r--r--source3/utils/make_printerdef.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/utils/make_printerdef.c b/source3/utils/make_printerdef.c
index 723c4fdf51..adf3b4c3e6 100644
--- a/source3/utils/make_printerdef.c
+++ b/source3/utils/make_printerdef.c
@@ -47,7 +47,7 @@ char *myfgets(char *s, int n, FILE *stream)
int i;
fgets(s,n,stream);
- while (LString1 = strchr(s,'%')) {
+ while ((LString1 = strchr(s,'%')) != NULL) {
if (!(LString2 = strchr(LString1+1,'%'))) break;
*LString2 = '\0';
strcpy(String,LString1+1);
@@ -56,7 +56,7 @@ char *myfgets(char *s, int n, FILE *stream)
if (strncmp(sbuffer[i],String,strlen(String))==0)
{
strcpy(String,sbuffer[i]);
- if (temp = strchr(String,'=')) ++temp;
+ if ((temp = strchr(String,'=')) != NULL) ++temp;
strcpy(String,temp);
break;
}
@@ -330,7 +330,7 @@ void scan_copyfiles(FILE *fichier, char *chaine)
} else {
part = strchr(buffer[i],',');
if (part) {
- if (mpart = strrchr(part+1,',')) {
+ if ((mpart = strrchr(part+1,','))!=NULL) {
strcpy(buffer[i],mpart+1);
} else
*part = '\0';
@@ -423,7 +423,7 @@ void scan_short_desc(FILE *fichier, char *short_desc)
temp = strtok(languagemonitor,",");
if (*temp == '"') ++temp;
strcpy(languagemonitor,temp);
- if (temp = strchr(languagemonitor,'"')) *temp = '\0';
+ if ((temp = strchr(languagemonitor,'"'))!=NULL) *temp = '\0';
}
if (i) fprintf(stderr,"End of section found\n");