Revision: 76529
          http://sourceforge.net/p/brlcad/code/76529
Author:   brlcad
Date:     2020-07-27 19:41:45 +0000 (Mon, 27 Jul 2020)
Log Message:
-----------
more one expression per line where embedding isn't required

Modified Paths:
--------------
    brlcad/trunk/src/libged/check/check_adj_air.c
    brlcad/trunk/src/libged/check/check_exp_air.c
    brlcad/trunk/src/libged/check/check_gap.c
    brlcad/trunk/src/libged/check/check_overlaps.c
    brlcad/trunk/src/libged/check/check_unconf_air.c
    brlcad/trunk/src/libged/check/check_volume.c
    brlcad/trunk/src/libged/color/color.c
    brlcad/trunk/src/libged/draw/loadview.c
    brlcad/trunk/src/libged/dump/dump.c
    brlcad/trunk/src/libged/edcodes/edcodes.c
    brlcad/trunk/src/libged/fb2pix/fb2pix.c
    brlcad/trunk/src/libged/ged_init.cpp
    brlcad/trunk/src/libged/gqa/gqa.c
    brlcad/trunk/src/libged/keep/keep.c
    brlcad/trunk/src/libged/move_all/move_all.c
    brlcad/trunk/src/libged/pix2fb/pix2fb.c
    brlcad/trunk/src/libged/plot/plot.c
    brlcad/trunk/src/libged/png2fb/png2fb.c
    brlcad/trunk/src/libged/pnts/pnts.cpp
    brlcad/trunk/src/libged/ps/ps.c
    brlcad/trunk/src/libged/rcodes/rcodes.c
    brlcad/trunk/src/libged/red/red.c
    brlcad/trunk/src/libged/rmater/rmater.c
    brlcad/trunk/src/libged/savekey/savekey.c
    brlcad/trunk/src/libged/saveview/saveview.c
    brlcad/trunk/src/libged/tables/tables.c
    brlcad/trunk/src/libged/wcodes/wcodes.c
    brlcad/trunk/src/libged/wmater/wmater.c

Modified: brlcad/trunk/src/libged/check/check_adj_air.c
===================================================================
--- brlcad/trunk/src/libged/check/check_adj_air.c       2020-07-27 19:30:50 UTC 
(rev 76528)
+++ brlcad/trunk/src/libged/check/check_adj_air.c       2020-07-27 19:41:45 UTC 
(rev 76529)
@@ -72,7 +72,8 @@
     BU_LIST_INIT(&(adjAirList.l));
 
     if (options->plot_files) {
-       if ((plot_adjair=fopen(name, "wb")) == (FILE *)NULL) {
+       plot_adjair = fopen(name, "wb");
+       if (plot_adjair == (FILE *)NULL) {
            bu_vls_printf(_ged_current_gedp->ged_result_str, "cannot open plot 
file %s\n", name);
        }
     }

Modified: brlcad/trunk/src/libged/check/check_exp_air.c
===================================================================
--- brlcad/trunk/src/libged/check/check_exp_air.c       2020-07-27 19:30:50 UTC 
(rev 76528)
+++ brlcad/trunk/src/libged/check/check_exp_air.c       2020-07-27 19:41:45 UTC 
(rev 76529)
@@ -73,7 +73,8 @@
     BU_LIST_INIT(&(exposedAirList.l));
 
     if (options->plot_files) {
-       if ((plot_exp_air=fopen(name, "wb")) == (FILE *)NULL) {
+       plot_exp_air = fopen(name, "wb");
+       if (plot_exp_air == (FILE *)NULL) {
            bu_vls_printf(_ged_current_gedp->ged_result_str, "cannot open plot 
file %s\n", name);
        }
     }

Modified: brlcad/trunk/src/libged/check/check_gap.c
===================================================================
--- brlcad/trunk/src/libged/check/check_gap.c   2020-07-27 19:30:50 UTC (rev 
76528)
+++ brlcad/trunk/src/libged/check/check_gap.c   2020-07-27 19:41:45 UTC (rev 
76529)
@@ -71,7 +71,8 @@
     BU_LIST_INIT(&(gapList.l));
 
     if (options->plot_files) {
-       if ((plot_gaps=fopen(name, "wb")) == (FILE *)NULL) {
+       plot_gaps = fopen(name, "wb");
+       if (plot_gaps == (FILE *)NULL) {
            bu_vls_printf(_ged_current_gedp->ged_result_str, "cannot open plot 
file %s\n", name);
        }
     }

Modified: brlcad/trunk/src/libged/check/check_overlaps.c
===================================================================
--- brlcad/trunk/src/libged/check/check_overlaps.c      2020-07-27 19:30:50 UTC 
(rev 76528)
+++ brlcad/trunk/src/libged/check/check_overlaps.c      2020-07-27 19:41:45 UTC 
(rev 76529)
@@ -294,7 +294,8 @@
     overlapList.maxdepth = 0;
 
     if (options->plot_files) {
-       if ((plot_overlaps=fopen(name, "wb")) == (FILE *)NULL) {
+       plot_overlaps = fopen(name, "wb");
+       if (plot_overlaps == (FILE *)NULL) {
            bu_vls_printf(_ged_current_gedp->ged_result_str, "cannot open plot 
file %s\n", name);
            return GED_ERROR;
        }

Modified: brlcad/trunk/src/libged/check/check_unconf_air.c
===================================================================
--- brlcad/trunk/src/libged/check/check_unconf_air.c    2020-07-27 19:30:50 UTC 
(rev 76528)
+++ brlcad/trunk/src/libged/check/check_unconf_air.c    2020-07-27 19:41:45 UTC 
(rev 76529)
@@ -84,7 +84,8 @@
     BU_LIST_INIT(&(unconfAirList.l));
 
     if (options->plot_files) {
-       if ((plot_unconf_air=fopen(name, "wb")) == (FILE *)NULL) {
+       plot_unconf_air = fopen(name, "wb");
+       if (plot_unconf_air == (FILE *)NULL) {
            bu_vls_printf(_ged_current_gedp->ged_result_str, "cannot open plot 
file %s\n", name);
        }
     }

Modified: brlcad/trunk/src/libged/check/check_volume.c
===================================================================
--- brlcad/trunk/src/libged/check/check_volume.c        2020-07-27 19:30:50 UTC 
(rev 76528)
+++ brlcad/trunk/src/libged/check/check_volume.c        2020-07-27 19:41:45 UTC 
(rev 76529)
@@ -36,7 +36,8 @@
     char *name = "volume.plot3";
 
     if (options->plot_files) {
-       if ((plot_volume=fopen(name, "wb")) == (FILE *)NULL) {
+       plot_volume = fopen(name, "wb");
+       if (plot_volume == (FILE *)NULL) {
            bu_vls_printf(_ged_current_gedp->ged_result_str, "cannot open plot 
file %s\n", name);
        }
        analyze_set_volume_plotfile(state, plot_volume);

Modified: brlcad/trunk/src/libged/color/color.c
===================================================================
--- brlcad/trunk/src/libged/color/color.c       2020-07-27 19:30:50 UTC (rev 
76528)
+++ brlcad/trunk/src/libged/color/color.c       2020-07-27 19:41:45 UTC (rev 
76529)
@@ -166,7 +166,8 @@
     }
 
     /* Read file and process it */
-    if ((fp = fopen(tmpfil, "r")) == NULL) {
+    fp = fopen(tmpfil, "r");
+    if (fp == NULL) {
        perror(tmpfil);
        return GED_ERROR;
     }

Modified: brlcad/trunk/src/libged/draw/loadview.c
===================================================================
--- brlcad/trunk/src/libged/draw/loadview.c     2020-07-27 19:30:50 UTC (rev 
76528)
+++ brlcad/trunk/src/libged/draw/loadview.c     2020-07-27 19:41:45 UTC (rev 
76529)
@@ -121,7 +121,8 @@
     }
 
     /* open the file for reading */
-    if ((fp = fopen(argv[1], "r")) == NULL) {
+    fp = fopen(argv[1], "r");
+    if (fp == NULL) {
        perror(argv[1]);
        return GED_ERROR;
     }

Modified: brlcad/trunk/src/libged/dump/dump.c
===================================================================
--- brlcad/trunk/src/libged/dump/dump.c 2020-07-27 19:30:50 UTC (rev 76528)
+++ brlcad/trunk/src/libged/dump/dump.c 2020-07-27 19:41:45 UTC (rev 76529)
@@ -56,7 +56,8 @@
        return GED_ERROR;
     }
 
-    if ((op = wdb_fopen(argv[1])) == RT_WDB_NULL) {
+    op = wdb_fopen(argv[1]);
+    if (op == RT_WDB_NULL) {
        bu_vls_printf(gedp->ged_result_str, "dump: %s: cannot create", argv[1]);
        return GED_ERROR;
     }

Modified: brlcad/trunk/src/libged/edcodes/edcodes.c
===================================================================
--- brlcad/trunk/src/libged/edcodes/edcodes.c   2020-07-27 19:30:50 UTC (rev 
76528)
+++ brlcad/trunk/src/libged/edcodes/edcodes.c   2020-07-27 19:41:45 UTC (rev 
76529)
@@ -239,7 +239,8 @@
        int line_count=0;
        int j;
 
-       if ((f_srt=fopen(tmpfil, "r+")) == NULL) {
+       f_srt = fopen(tmpfil, "r+");
+       if (f_srt == NULL) {
            bu_vls_printf(gedp->ged_result_str, "%s: Failed to open temp file 
for sorting\n", argv[0]);
            bu_file_delete(tmpfil);
            return GED_ERROR;

Modified: brlcad/trunk/src/libged/fb2pix/fb2pix.c
===================================================================
--- brlcad/trunk/src/libged/fb2pix/fb2pix.c     2020-07-27 19:30:50 UTC (rev 
76528)
+++ brlcad/trunk/src/libged/fb2pix/fb2pix.c     2020-07-27 19:41:45 UTC (rev 
76529)
@@ -85,7 +85,8 @@
        outfp = stdout;
     } else {
        file_name = argv[bu_optind];
-       if ((outfp = fopen(file_name, "wb")) == NULL) {
+       outfp = fopen(file_name, "wb");
+       if (outfp == NULL) {
            fprintf(stderr,
                          "fb-pix: cannot open \"%s\" for writing\n",
                          file_name);

Modified: brlcad/trunk/src/libged/ged_init.cpp
===================================================================
--- brlcad/trunk/src/libged/ged_init.cpp        2020-07-27 19:30:50 UTC (rev 
76528)
+++ brlcad/trunk/src/libged/ged_init.cpp        2020-07-27 19:41:45 UTC (rev 
76529)
@@ -123,7 +123,8 @@
        char pfile[MAXPATHLEN] = {0};
        bu_dir(pfile, MAXPATHLEN, BU_DIR_LIBEXEC, "ged", filenames[i], NULL);
        void *dl_handle;
-       if (!(dl_handle = bu_dlopen(pfile, BU_RTLD_NOW))) {
+       dl_handle = bu_dlopen(pfile, BU_RTLD_NOW);
+       if (!dl_handle) {
            const char * const error_msg = bu_dlerror();
            if (error_msg)
                bu_vls_printf(ged_init_msg_str, "%s\n", error_msg);

Modified: brlcad/trunk/src/libged/gqa/gqa.c
===================================================================
--- brlcad/trunk/src/libged/gqa/gqa.c   2020-07-27 19:30:50 UTC (rev 76528)
+++ brlcad/trunk/src/libged/gqa/gqa.c   2020-07-27 19:41:45 UTC (rev 76529)
@@ -1538,7 +1538,8 @@
            struct bu_vls vp = BU_VLS_INIT_ZERO;
            bu_vls_printf(&vp, "%svolume.plot3", plot_prefix);
            bu_log("Plotting volumes to %s\n", bu_vls_cstr(&vp));
-           if ((plot_volume = fopen(bu_vls_cstr(&vp), "wb")) == (FILE *)NULL) {
+           plot_volume = fopen(bu_vls_cstr(&vp), "wb");
+           if (plot_volume == (FILE *)NULL) {
                bu_vls_printf(_ged_current_gedp->ged_result_str, "cannot open 
plot file %s\n", bu_vls_cstr(&vp));
                /* not a critical failure */
            }
@@ -1566,7 +1567,8 @@
            struct bu_vls vp = BU_VLS_INIT_ZERO;
            bu_vls_printf(&vp, "%sgaps.plot3", plot_prefix);
            bu_log("Plotting gaps to %s\n", bu_vls_cstr(&vp));
-           if ((plot_gaps = fopen(bu_vls_cstr(&vp), "wb")) == (FILE *)NULL) {
+           plot_gaps = fopen(bu_vls_cstr(&vp), "wb");
+           if (plot_gaps == (FILE *)NULL) {
                bu_vls_printf(_ged_current_gedp->ged_result_str, "cannot open 
plot file %s\n", bu_vls_cstr(&vp));
                /* not a critical failure */
            }
@@ -1580,7 +1582,8 @@
            struct bu_vls vp = BU_VLS_INIT_ZERO;
            bu_vls_printf(&vp, "%soverlaps.plot3", plot_prefix);
            bu_log("Plotting overlaps to %s\n", bu_vls_cstr(&vp));
-           if ((plot_overlaps = fopen(bu_vls_cstr(&vp), "wb")) == (FILE 
*)NULL) {
+           plot_overlaps = fopen(bu_vls_cstr(&vp), "wb");
+           if (plot_overlaps == (FILE *)NULL) {
                bu_vls_printf(_ged_current_gedp->ged_result_str, "cannot open 
plot file %s\n", bu_vls_cstr(&vp));
                /* not a critical failure */
            }
@@ -1597,7 +1600,8 @@
            struct bu_vls vp = BU_VLS_INIT_ZERO;
            bu_vls_printf(&vp, "%sadj_air.plot3", plot_prefix);
            bu_log("Plotting adjacent air to %s\n", bu_vls_cstr(&vp));
-           if ((plot_adjair = fopen(bu_vls_cstr(&vp), "wb")) == (FILE *)NULL) {
+           plot_adjair = fopen(bu_vls_cstr(&vp), "wb");
+           if (plot_adjair == (FILE *)NULL) {
                bu_vls_printf(_ged_current_gedp->ged_result_str, "cannot open 
plot file %s\n", bu_vls_cstr(&vp));
                /* not a critical failure */
            }
@@ -1609,7 +1613,8 @@
            struct bu_vls vp = BU_VLS_INIT_ZERO;
            bu_vls_printf(&vp, "%sexp_air.plot3", plot_prefix);
            bu_log("Plotting exposed air to %s\n", bu_vls_cstr(&vp));
-           if ((plot_expair = fopen(bu_vls_cstr(&vp), "wb")) == (FILE *)NULL) {
+           plot_expair = fopen(bu_vls_cstr(&vp), "wb");
+           if (plot_expair == (FILE *)NULL) {
                bu_vls_printf(_ged_current_gedp->ged_result_str, "cannot open 
plot file %s\n", bu_vls_cstr(&vp));
                /* not a critical failure */
            }

Modified: brlcad/trunk/src/libged/keep/keep.c
===================================================================
--- brlcad/trunk/src/libged/keep/keep.c 2020-07-27 19:30:50 UTC (rev 76528)
+++ brlcad/trunk/src/libged/keep/keep.c 2020-07-27 19:41:45 UTC (rev 76529)
@@ -172,7 +172,8 @@
            return GED_ERROR;
        }
 
-       if ((keepfp = wdb_dbopen(new_dbip, RT_WDB_TYPE_DB_DISK)) == NULL) {
+       keepfp = wdb_dbopen(new_dbip, RT_WDB_TYPE_DB_DISK);
+       if (keepfp == NULL) {
            bu_vls_printf(gedp->ged_result_str, "%s:  Error opening '%s'\n", 
cmd, argv[0]);
            return GED_ERROR;
        } else {

Modified: brlcad/trunk/src/libged/move_all/move_all.c
===================================================================
--- brlcad/trunk/src/libged/move_all/move_all.c 2020-07-27 19:30:50 UTC (rev 
76528)
+++ brlcad/trunk/src/libged/move_all/move_all.c 2020-07-27 19:41:45 UTC (rev 
76529)
@@ -220,7 +220,8 @@
     FILE *fp;
     char line[512];
 
-    if ((fp=fopen(file, "r")) == NULL) {
+    fp = fopen(file, "r");
+    if (fp == NULL) {
        bu_vls_printf(gedp->ged_result_str, "cannot open %s\n", file);
        return GED_ERROR;
     }

Modified: brlcad/trunk/src/libged/pix2fb/pix2fb.c
===================================================================
--- brlcad/trunk/src/libged/pix2fb/pix2fb.c     2020-07-27 19:30:50 UTC (rev 
76528)
+++ brlcad/trunk/src/libged/pix2fb/pix2fb.c     2020-07-27 19:41:45 UTC (rev 
76529)
@@ -152,7 +152,8 @@
        setmode(infd, O_BINARY);
     } else {
        file_name = argv[bu_optind];
-       if ((infd = open(file_name, 0)) < 0) {
+       infd = open(file_name, 0);
+       if (infd < 0) {
            perror(file_name);
            fprintf(stderr,
                          "pix-fb: cannot open \"%s\" for reading\n",

Modified: brlcad/trunk/src/libged/plot/plot.c
===================================================================
--- brlcad/trunk/src/libged/plot/plot.c 2020-07-27 19:30:50 UTC (rev 76528)
+++ brlcad/trunk/src/libged/plot/plot.c 2020-07-27 19:41:45 UTC (rev 76529)
@@ -124,7 +124,8 @@
        bu_vls_free(&str);
        is_pipe = 1;
     } else {
-       if ((fp = fopen(argv[1], "wb")) == NULL) {
+       fp = fopen(argv[1], "wb");
+       if (fp == NULL) {
            perror(argv[1]);
            return GED_ERROR;
        }

Modified: brlcad/trunk/src/libged/png2fb/png2fb.c
===================================================================
--- brlcad/trunk/src/libged/png2fb/png2fb.c     2020-07-27 19:30:50 UTC (rev 
76528)
+++ brlcad/trunk/src/libged/png2fb/png2fb.c     2020-07-27 19:41:45 UTC (rev 
76529)
@@ -115,7 +115,8 @@
        setmode(fileno(fp_in), O_BINARY);
     } else {
        file_name = argv[bu_optind];
-       if ((fp_in = fopen(file_name, "rb")) == NULL) {
+       fp_in = fopen(file_name, "rb");
+       if (fp_in == NULL) {
            perror(file_name);
            fprintf(stderr,
                    "png-fb: cannot open \"%s\" for reading\n",

Modified: brlcad/trunk/src/libged/pnts/pnts.cpp
===================================================================
--- brlcad/trunk/src/libged/pnts/pnts.cpp       2020-07-27 19:30:50 UTC (rev 
76528)
+++ brlcad/trunk/src/libged/pnts/pnts.cpp       2020-07-27 19:41:45 UTC (rev 
76529)
@@ -731,7 +731,8 @@
        return GED_ERROR;
     }
 
-    if ((fp=fopen(filename, "rb")) == NULL) {
+    fp = fopen(filename, "rb");
+    if (fp == NULL) {
        bu_vls_printf(gedp->ged_result_str, "Could not open file '%s'.\n", 
filename);
        bu_vls_free(&unit);
        bu_vls_free(&fmt);
@@ -890,7 +891,8 @@
     }
 
     /* Write points */
-    if ((fp=fopen(filename, "wb+")) == NULL) {
+    fp = fopen(filename, "wb+");
+    if (fp == NULL) {
        bu_vls_sprintf(gedp->ged_result_str, "Error: cannot open file %s for 
writing\n", filename);
        return GED_ERROR;
     }

Modified: brlcad/trunk/src/libged/ps/ps.c
===================================================================
--- brlcad/trunk/src/libged/ps/ps.c     2020-07-27 19:30:50 UTC (rev 76528)
+++ brlcad/trunk/src/libged/ps/ps.c     2020-07-27 19:41:45 UTC (rev 76529)
@@ -173,7 +173,8 @@
        goto bad;
     }
 
-    if ((fp = fopen(argv[bu_optind], "wb")) == NULL) {
+    fp = fopen(argv[bu_optind], "wb");
+    if (fp == NULL) {
        bu_vls_printf(gedp->ged_result_str, "%s: Error opening file - %s\n", 
argv[0], argv[bu_optind]);
        goto bad;
     }

Modified: brlcad/trunk/src/libged/rcodes/rcodes.c
===================================================================
--- brlcad/trunk/src/libged/rcodes/rcodes.c     2020-07-27 19:30:50 UTC (rev 
76528)
+++ brlcad/trunk/src/libged/rcodes/rcodes.c     2020-07-27 19:41:45 UTC (rev 
76529)
@@ -64,7 +64,8 @@
        return GED_ERROR;
     }
 
-    if ((fp = fopen(argv[1], "r")) == NULL) {
+    fp = fopen(argv[1], "r");
+    if (fp == NULL) {
        bu_vls_printf(gedp->ged_result_str, "%s: Failed to read file - %s", 
argv[0], argv[1]);
        return GED_ERROR;
     }

Modified: brlcad/trunk/src/libged/red/red.c
===================================================================
--- brlcad/trunk/src/libged/red/red.c   2020-07-27 19:30:50 UTC (rev 76528)
+++ brlcad/trunk/src/libged/red/red.c   2020-07-27 19:41:45 UTC (rev 76529)
@@ -597,7 +597,8 @@
        RT_CK_COMB(comb);
 
     /* open the file */
-    if ((fp=fopen(_ged_tmpfil, "w")) == NULL) {
+    fp = fopen(_ged_tmpfil, "w");
+    if (fp == NULL) {
        perror("fopen");
        bu_vls_printf(gedp->ged_result_str, "ERROR: Cannot open temporary file 
[%s] for writing\n", _ged_tmpfil);
        bu_vls_free(&spacer);

Modified: brlcad/trunk/src/libged/rmater/rmater.c
===================================================================
--- brlcad/trunk/src/libged/rmater/rmater.c     2020-07-27 19:30:50 UTC (rev 
76528)
+++ brlcad/trunk/src/libged/rmater/rmater.c     2020-07-27 19:41:45 UTC (rev 
76529)
@@ -113,7 +113,8 @@
        return GED_ERROR;
     }
 
-    if ((fp = fopen(argv[1], "r")) == NULL) {
+    fp = fopen(argv[1], "r");
+    if (fp == NULL) {
        bu_vls_printf(gedp->ged_result_str, "ged_rmater: Failed to read file - 
%s", argv[1]);
        return GED_ERROR;
     }

Modified: brlcad/trunk/src/libged/savekey/savekey.c
===================================================================
--- brlcad/trunk/src/libged/savekey/savekey.c   2020-07-27 19:30:50 UTC (rev 
76528)
+++ brlcad/trunk/src/libged/savekey/savekey.c   2020-07-27 19:41:45 UTC (rev 
76529)
@@ -83,7 +83,8 @@
        return GED_ERROR;
     }
 
-    if ((fp = fopen(argv[1], "a")) == NULL) {
+    fp = fopen(argv[1], "a");
+    if (fp == NULL) {
        perror(argv[1]);
        return GED_ERROR;
     }

Modified: brlcad/trunk/src/libged/saveview/saveview.c
===================================================================
--- brlcad/trunk/src/libged/saveview/saveview.c 2020-07-27 19:30:50 UTC (rev 
76528)
+++ brlcad/trunk/src/libged/saveview/saveview.c 2020-07-27 19:41:45 UTC (rev 
76529)
@@ -128,7 +128,8 @@
        return GED_ERROR;
     }
 
-    if ((fp = fopen(argv[1], "a")) == NULL) {
+    fp = fopen(argv[1], "a");
+    if (fp == NULL) {
        perror(argv[1]);
        return GED_ERROR;
     }

Modified: brlcad/trunk/src/libged/tables/tables.c
===================================================================
--- brlcad/trunk/src/libged/tables/tables.c     2020-07-27 19:30:50 UTC (rev 
76528)
+++ brlcad/trunk/src/libged/tables/tables.c     2020-07-27 19:41:45 UTC (rev 
76529)
@@ -498,7 +498,8 @@
     }
 
     /* open the file */
-    if ((test_f=fopen(argv[1], "w+")) == NULL) {
+    test_f = fopen(argv[1], "w+");
+    if (test_f == NULL) {
        bu_vls_printf(gedp->ged_result_str, "%s:  Can't open %s\n", argv[0], 
argv[1]);
        status = GED_ERROR;
        goto end;
@@ -561,7 +562,8 @@
        bu_vls_printf(&tabvls, "* 9999999\n* 9999999\n* 9999999\n* 9999999\n* 
9999999\n");
     }
 
-    if ((ftabvls=fopen(argv[1], "w+")) == NULL) {
+    ftabvls = fopen(argv[1], "w+");
+    if (ftabvls == NULL) {
        bu_vls_printf(gedp->ged_result_str, "%s:  Can't open %s\n", argv[0], 
argv[1]);
        status = GED_ERROR;
        goto end;

Modified: brlcad/trunk/src/libged/wcodes/wcodes.c
===================================================================
--- brlcad/trunk/src/libged/wcodes/wcodes.c     2020-07-27 19:30:50 UTC (rev 
76528)
+++ brlcad/trunk/src/libged/wcodes/wcodes.c     2020-07-27 19:41:45 UTC (rev 
76529)
@@ -147,7 +147,8 @@
        return GED_ERROR;
     }
 
-    if ((fp = fopen(argv[1], "w")) == NULL) {
+    fp = fopen(argv[1], "w");
+    if (fp == NULL) {
        bu_vls_printf(gedp->ged_result_str, "%s: Failed to open file - %s",
                      argv[0], argv[1]);
        return GED_ERROR;

Modified: brlcad/trunk/src/libged/wmater/wmater.c
===================================================================
--- brlcad/trunk/src/libged/wmater/wmater.c     2020-07-27 19:30:50 UTC (rev 
76528)
+++ brlcad/trunk/src/libged/wmater/wmater.c     2020-07-27 19:41:45 UTC (rev 
76529)
@@ -56,7 +56,8 @@
        return GED_ERROR;
     }
 
-    if ((fp = fopen(argv[1], "a")) == NULL) {
+    fp = fopen(argv[1], "a");
+    if (fp == NULL) {
        bu_vls_printf(gedp->ged_result_str, "%s: Failed to open file - %s", 
argv[0], argv[1]);
        return GED_ERROR;
     }

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to