Mercurial > hg > wm

changeset 15:ad1d224896c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix scanf() warning
author Peter Meerwald <pmeerw@cosy.sbg.ac.at>
date Mon, 30 Jun 2008 20:59:01 +0200
parents 1906e659edd0
children 4987db85cfae
files Meerwald/cmp_kund2_sig.c Meerwald/cmp_kund3_sig.c Meerwald/cmp_xie2_sig.c Meerwald/cmp_xie_sig.c Meerwald/gen_dugad_sig.c Meerwald/gen_kim_sig.c Meerwald/gen_kund2_sig.c Meerwald/gen_kund3_sig.c Meerwald/gen_wang_sig.c Meerwald/gen_xia_sig.c Meerwald/gen_xie2_sig.c Meerwald/gen_xie_sig.c Meerwald/gen_zhu_sig.c Meerwald/wm_corvi_d.c Meerwald/wm_corvi_e.c Meerwald/wm_corvi_s.c Meerwald/wm_dugad_d.c Meerwald/wm_dugad_e.c Meerwald/wm_kim_a.c Meerwald/wm_kim_d.c Meerwald/wm_kim_e.c Meerwald/wm_kund2_d.c Meerwald/wm_kund2_e.c Meerwald/wm_kund3_d.c Meerwald/wm_kund3_e.c Meerwald/wm_kund_e.c Meerwald/wm_wang_d.c Meerwald/wm_wang_e.c Meerwald/wm_xia_d.c Meerwald/wm_xia_e.c Meerwald/wm_xie2_d.c Meerwald/wm_xie2_e.c Meerwald/wm_xie_d.c Meerwald/wm_xie_e.c Meerwald/wm_zhu_d.c Meerwald/wm_zhu_e.c
diffstat 36 files changed, 37 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/Meerwald/cmp_kund2_sig.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/cmp_kund2_sig.c	Mon Jun 30 20:59:01 2008 +0200
@@ -101,7 +101,7 @@
       fscanf(sig, "%d\n", &blocksize);
       fscanf(sig, "%d\n", &method);
       fscanf(sig, "%d\n", &filter);
-      fscanf(sig, "%[^\n\r]\n", &filter_name);
+      fscanf(sig, "%[^\n\r]\n", filter_name);
       fscanf(sig, "%d\n", &level);
       fscanf(sig, "%d\n", &seed);
       srandom(seed);
--- a/Meerwald/cmp_kund3_sig.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/cmp_kund3_sig.c	Mon Jun 30 20:59:01 2008 +0200
@@ -99,7 +99,7 @@
       fscanf(sig, "%d\n", &quality);
       fscanf(sig, "%d\n", &method);
       fscanf(sig, "%d\n", &filter);
-      fscanf(sig, "%[^\n\r]\n", &filter_name);
+      fscanf(sig, "%[^\n\r]\n", filter_name);
       fscanf(sig, "%d\n", &level);
       fscanf(sig, "%d\n", &seed);
       srandom(seed);
--- a/Meerwald/cmp_xie2_sig.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/cmp_xie2_sig.c	Mon Jun 30 20:59:01 2008 +0200
@@ -97,7 +97,7 @@
       fscanf(sig, "%lf\n", &alpha);
       fscanf(sig, "%d\n", &method);
       fscanf(sig, "%d\n", &filter);
-      fscanf(sig, "%[^\n\r]\n", &filter_name);
+      fscanf(sig, "%[^\n\r]\n", filter_name);
       fscanf(sig, "%d\n", &quant);
       fscanf(sig, "%d\n", &level);
       fscanf(sig, "%d\n", &seed);
--- a/Meerwald/cmp_xie_sig.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/cmp_xie_sig.c	Mon Jun 30 20:59:01 2008 +0200
@@ -96,7 +96,7 @@
       fscanf(sig, "%lf\n", &alpha);
       fscanf(sig, "%d\n", &method);
       fscanf(sig, "%d\n", &filter);
-      fscanf(sig, "%[^\n\r]\n", &filter_name);
+      fscanf(sig, "%[^\n\r]\n", filter_name);
       fscanf(sig, "%d\n", &level);
       fscanf(sig, "%d\n", &seed);
       srandom(seed);
--- a/Meerwald/gen_dugad_sig.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/gen_dugad_sig.c	Mon Jun 30 20:59:01 2008 +0200
@@ -172,7 +172,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(F, ""))
-        fscanf(sig, "%[^\n\r]\n", &F);
+        fscanf(sig, "%[^\n\r]\n", F);
       else
         fscanf(sig, "%*[^\n\r]\n");
     }
--- a/Meerwald/gen_kim_sig.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/gen_kim_sig.c	Mon Jun 30 20:59:01 2008 +0200
@@ -158,7 +158,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(F, ""))
-        fscanf(sig, "%[^\n\r]\n", &F);
+        fscanf(sig, "%[^\n\r]\n", F);
       else
         fscanf(sig, "%*[^\n\r]\n");
     }
--- a/Meerwald/gen_kund2_sig.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/gen_kund2_sig.c	Mon Jun 30 20:59:01 2008 +0200
@@ -163,7 +163,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(F, ""))
-        fscanf(sig, "%[^\n\r]\n", &F);
+        fscanf(sig, "%[^\n\r]\n", F);
       else
         fscanf(sig, "%*[^\n\r]\n");
       if (l == 0)
--- a/Meerwald/gen_kund3_sig.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/gen_kund3_sig.c	Mon Jun 30 20:59:01 2008 +0200
@@ -152,7 +152,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(F, ""))
-        fscanf(sig, "%[^\n\r]\n", &F);
+        fscanf(sig, "%[^\n\r]\n", F);
       else
         fscanf(sig, "%*[^\n\r]\n");
       if (l == 0)
--- a/Meerwald/gen_wang_sig.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/gen_wang_sig.c	Mon Jun 30 20:59:01 2008 +0200
@@ -145,7 +145,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(F, ""))
-        fscanf(sig, "%[^\n\r]\n", &F);
+        fscanf(sig, "%[^\n\r]\n", F);
       else
         fscanf(sig, "%*[^\n\r]\n");
     }
--- a/Meerwald/gen_xia_sig.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/gen_xia_sig.c	Mon Jun 30 20:59:01 2008 +0200
@@ -145,7 +145,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(F, ""))
-        fscanf(sig, "%[^\n\r]\n", &F);
+        fscanf(sig, "%[^\n\r]\n", F);
       else
         fscanf(sig, "%*[^\n\r]\n");
     }
--- a/Meerwald/gen_xie2_sig.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/gen_xie2_sig.c	Mon Jun 30 20:59:01 2008 +0200
@@ -155,7 +155,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(F, ""))
-        fscanf(sig, "%[^\n\r]\n", &F);
+        fscanf(sig, "%[^\n\r]\n", F);
       else
         fscanf(sig, "%*[^\n\r]\n");
       if (q == 0)
--- a/Meerwald/gen_xie_sig.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/gen_xie_sig.c	Mon Jun 30 20:59:01 2008 +0200
@@ -150,7 +150,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(F, ""))
-        fscanf(sig, "%[^\n\r]\n", &F);
+        fscanf(sig, "%[^\n\r]\n", F);
       else
         fscanf(sig, "%*[^\n\r]\n");
       if (l == 0)
--- a/Meerwald/gen_zhu_sig.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/gen_zhu_sig.c	Mon Jun 30 20:59:01 2008 +0200
@@ -145,7 +145,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(F, ""))
-        fscanf(sig, "%[^\n\r]\n", &F);
+        fscanf(sig, "%[^\n\r]\n", F);
       else
         fscanf(sig, "%*[^\n\r]\n");
     }
--- a/Meerwald/wm_corvi_d.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_corvi_d.c	Mon Jun 30 20:59:01 2008 +0200
@@ -166,7 +166,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
     }
--- a/Meerwald/wm_corvi_e.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_corvi_e.c	Mon Jun 30 20:59:01 2008 +0200
@@ -140,7 +140,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
     }
--- a/Meerwald/wm_corvi_s.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_corvi_s.c	Mon Jun 30 20:59:01 2008 +0200
@@ -173,7 +173,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
     }
--- a/Meerwald/wm_dugad_d.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_dugad_d.c	Mon Jun 30 20:59:01 2008 +0200
@@ -193,7 +193,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
     }
--- a/Meerwald/wm_dugad_e.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_dugad_e.c	Mon Jun 30 20:59:01 2008 +0200
@@ -178,7 +178,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
     }
--- a/Meerwald/wm_kim_a.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_kim_a.c	Mon Jun 30 20:59:01 2008 +0200
@@ -199,7 +199,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
     }
--- a/Meerwald/wm_kim_d.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_kim_d.c	Mon Jun 30 20:59:01 2008 +0200
@@ -216,7 +216,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
     }
--- a/Meerwald/wm_kim_e.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_kim_e.c	Mon Jun 30 20:59:01 2008 +0200
@@ -196,7 +196,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
     }
--- a/Meerwald/wm_kund2_d.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_kund2_d.c	Mon Jun 30 20:59:01 2008 +0200
@@ -162,7 +162,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
       if (level == 0)
--- a/Meerwald/wm_kund2_e.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_kund2_e.c	Mon Jun 30 20:59:01 2008 +0200
@@ -50,7 +50,7 @@
   Image_tree dwts, p;
 
   gray maxval;
-  int rows, cols, colors, format;
+  int rows, cols, format;
 
   progname = argv[0];
 
@@ -160,7 +160,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
       if (level == 0)
--- a/Meerwald/wm_kund3_d.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_kund3_d.c	Mon Jun 30 20:59:01 2008 +0200
@@ -153,7 +153,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
       if (level == 0)
--- a/Meerwald/wm_kund3_e.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_kund3_e.c	Mon Jun 30 20:59:01 2008 +0200
@@ -151,7 +151,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
       if (level == 0)
--- a/Meerwald/wm_kund_e.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_kund_e.c	Mon Jun 30 20:59:01 2008 +0200
@@ -153,7 +153,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
       if (level == 0)
--- a/Meerwald/wm_wang_d.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_wang_d.c	Mon Jun 30 20:59:01 2008 +0200
@@ -184,7 +184,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
     }
--- a/Meerwald/wm_wang_e.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_wang_e.c	Mon Jun 30 20:59:01 2008 +0200
@@ -157,7 +157,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
     }
--- a/Meerwald/wm_xia_d.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_xia_d.c	Mon Jun 30 20:59:01 2008 +0200
@@ -203,7 +203,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
     }
--- a/Meerwald/wm_xia_e.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_xia_e.c	Mon Jun 30 20:59:01 2008 +0200
@@ -177,7 +177,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
     }
--- a/Meerwald/wm_xie2_d.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_xie2_d.c	Mon Jun 30 20:59:01 2008 +0200
@@ -170,7 +170,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
       if (quant == 0)
--- a/Meerwald/wm_xie2_e.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_xie2_e.c	Mon Jun 30 20:59:01 2008 +0200
@@ -164,7 +164,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
       if (quant == 0)
--- a/Meerwald/wm_xie_d.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_xie_d.c	Mon Jun 30 20:59:01 2008 +0200
@@ -165,7 +165,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
       if (level == 0)
--- a/Meerwald/wm_xie_e.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_xie_e.c	Mon Jun 30 20:59:01 2008 +0200
@@ -159,7 +159,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
       if (level == 0)
--- a/Meerwald/wm_zhu_d.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_zhu_d.c	Mon Jun 30 20:59:01 2008 +0200
@@ -183,7 +183,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
     }
--- a/Meerwald/wm_zhu_e.c	Mon Jun 30 15:46:32 2008 +0200
+++ b/Meerwald/wm_zhu_e.c	Mon Jun 30 20:59:01 2008 +0200
@@ -156,7 +156,7 @@
       else
         fscanf(sig, "%*d\n");
       if (!strcmp(filter_name, ""))
-        fscanf(sig, "%[^\n\r]\n", &filter_name);
+        fscanf(sig, "%[^\n\r]\n", filter_name);
       else
         fscanf(sig, "%*[^\n\r]\n");
     }

Repositories maintained by Peter Meerwald, pmeerw@pmeerw.net.