* put.c: move whether spans are enabled into a flag in struct state

Author: lutter

src/builtin.c

@@ -222,7 +222,7 @@ static struct value *lens_put(struct info *info, struct value *l,
 
     init_memstream(&ms);
     lns_put(info, ms.stream, l->lens, tree->origin->children,
-            str->string->str, &err);
+            str->string->str, 0, &err);
     close_memstream(&ms);
 
     if (err == NULL && ! HAS_ERR(info)) {

src/lens.h

@@ -209,7 +209,7 @@ struct skel *lns_parse(struct lens *lens, const char *text,
  * to update spans or not.
  */
 void lns_put(struct info *info, FILE *out, struct lens *lens, struct tree *tree,
-             const char *text, struct lns_error **err);
+             const char *text, int enable_span, struct lns_error **err);
 
 /* Free up temporary data structures, most importantly compiled
    regular expressions */

src/put.c

@@ -840,7 +840,7 @@ static void create_lens(struct lens *lens, struct state *state) {
 }
 
 void lns_put(struct info *info, FILE *out, struct lens *lens, struct tree *tree,
-             const char *text, struct lns_error **err) {
+             const char *text, int enable_span, struct lns_error **err) {
     struct state state;
     struct lns_error *err1;
 
@@ -862,7 +862,7 @@ void lns_put(struct info *info, FILE *out, struct lens *lens, struct tree *tree,
     }
     state.out = out;
     state.split = make_split(tree);
-    state.with_span = info->flags & AUG_ENABLE_SPAN;
+    state.with_span = enable_span;
     state.tree = tree;
     state.info = info;
     if (state.with_span) {

src/transform.c

@@ -1115,7 +1115,8 @@ static void lens_put(struct augeas *aug, const char *filename,
         tree->span->span_start = ftell(out);
     }
 
-    lns_put(info, out, lens, tree->children, text, err);
+    lns_put(info, out, lens, tree->children, text,
+            aug->flags & AUG_ENABLE_SPAN, err);
 
     if (with_span) {
         tree->span->span_end = ftell(out);