* src/lsh.c (main_argp_parser): Use STATIC_REPORT_EXCEPTION_INFO,

and const.
* src/lshd.c (main): Likewise.

Rev: src/lsh.c:1.164
Rev: src/lshd.c:1.139

src/lsh.c

@@ -887,13 +887,16 @@ main_argp_parser(int key, char *arg, struct argp_state *state)
 	  }
 	if (s)
 	  {
+	    static const struct report_exception_info report =
+	      STATIC_REPORT_EXCEPTION_INFO(EXC_IO, EXC_IO,
+					   "Writing new ACL: ");
+	    
 	    struct lsh_fd *f
 	      = io_write_file(s,
 			      O_CREAT | O_APPEND | O_WRONLY,
 			      0600, 500, NULL,
 			      make_report_exception_handler
-			      (make_report_exception_info(EXC_IO, EXC_IO,
-							  "Writing new ACL: "),
+			      (&report,
 			       &default_exception_handler,
 			       HANDLER_CONTEXT));
 	    if (f)

src/lshd.c

@@ -1067,11 +1067,16 @@ main(int argc, char **argv)
 					    make_alist(1, ATOM_SSH_CONNECTION,
 						       connection_service,-1)),
 		      -1))));
+
+      static const struct report_exception_info report =
+	STATIC_REPORT_EXCEPTION_INFO(EXC_IO, EXC_IO,
+				     "lshd: ");
+	    
       
       COMMAND_CALL(server_listen, options,
 		   &discard_continuation,
 		   make_report_exception_handler
-		   (make_report_exception_info(EXC_IO, EXC_IO, "lshd: "),
+		   (&report,
 		    options->e,
 		    HANDLER_CONTEXT));
     }