瀏覽代碼

Fix too many arguments in call of function (#1276)

Co-authored-by: Markus Metz <markus.metz.giswork@gmail.com>
nila 4 年之前
父節點
當前提交
8b4c4986ea
共有 3 個文件被更改,包括 11 次插入11 次删除
  1. 3 3
      include/defs/nviz.h
  2. 6 6
      lib/nviz/draw.c
  3. 2 2
      raster/r.horizon/main.c

+ 3 - 3
include/defs/nviz.h

@@ -35,9 +35,9 @@ int Nviz_set_cplane_here(nv_data *, int, float, float);
 
 /* draw.c */
 int Nviz_draw_all_surf(nv_data *);
-int Nviz_draw_all_vect();
-int Nviz_draw_all_site();
-int Nviz_draw_all_vol();
+int Nviz_draw_all_vect(void);
+int Nviz_draw_all_site(void);
+int Nviz_draw_all_vol(void);
 int Nviz_draw_all(nv_data *);
 int Nviz_draw_quick(nv_data *, int);
 int Nviz_load_image(GLubyte *, int, int, int);

+ 6 - 6
lib/nviz/draw.c

@@ -118,7 +118,7 @@ int sort_surfs_max(int *surf, int *id_sort, int *indices, int num)
 
    \return 1
  */
-int Nviz_draw_all_vect()
+int Nviz_draw_all_vect(void)
 {
     /* GS_set_cancel(0); */
 
@@ -143,7 +143,7 @@ int Nviz_draw_all_vect()
 
    \return 1
  */
-int Nviz_draw_all_site()
+int Nviz_draw_all_site(void)
 {
     int i;
     int *site_list, nsites;
@@ -172,7 +172,7 @@ int Nviz_draw_all_site()
 
    \return 1
  */
-int Nviz_draw_all_vol()
+int Nviz_draw_all_vol(void)
 {
     int *vol_list, nvols, i;
 
@@ -230,13 +230,13 @@ int Nviz_draw_all(nv_data * data)
 	Nviz_draw_all_surf(data);
 
     if (draw_vect)
-	Nviz_draw_all_vect(data);
+	Nviz_draw_all_vect();
 
     if (draw_site)
-	Nviz_draw_all_site(data);
+	Nviz_draw_all_site();
 
     if (draw_vol)
-	Nviz_draw_all_vol(data);
+	Nviz_draw_all_vol();
 	
     for(i = 0; i < data->num_fringes; i++) {
 	struct fringe_data * f = data->fringe[i];

+ 2 - 2
raster/r.horizon/main.c

@@ -129,7 +129,7 @@ double TOLER;
 const char *str_step;
 
 int mode;
-int isMode()
+int isMode(void)
 {
     return mode;
 }
@@ -393,7 +393,7 @@ int main(int argc, char *argv[])
 	sscanf(parm.direction->answer, "%lf", &single_direction);
 
 
-    if (isMode(WHOLE_RASTER)) {
+    if (WHOLE_RASTER == isMode()) {
 	if ((parm.direction->answer == NULL) && (parm.step->answer == NULL)) {
 	    G_fatal_error(
 		_("You didn't specify a direction value or step size. Aborting."));