浏览代码

Generate error if both file= and expression= are given

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@42659 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 15 年之前
父节点
当前提交
184c368615
共有 1 个文件被更改,包括 3 次插入0 次删除
  1. 3 0
      raster/r.mapcalc/main.c

+ 3 - 0
raster/r.mapcalc/main.c

@@ -141,6 +141,9 @@ int main(int argc, char **argv)
 
 
     overwrite_flag = module->overwrite;
     overwrite_flag = module->overwrite;
 
 
+    if (expr->answer && file->answer)
+	G_fatal_error(_("file= and expression= are mutually exclusive"));
+
     if (expr->answer)
     if (expr->answer)
 	result = parse_string(expr->answer);
 	result = parse_string(expr->answer);
     else if (file->answer)
     else if (file->answer)