gEDA-cvs: CVS update: g_basic.nw

[cvspsrv@xxxxxxxx]

  User: danmc   
  Date: 05/02/13 21:17:36

  Log:
  put back scm_makfrom0str().  It is scm_makfromstr() which was deprecated,
  
  scm_makfrom0str() is still ok.  Suggested by Patrick Bernaud.
  
  
  
  
  Revision  Changes    Path
  1.44      +0 -3      eda/geda/devel/libgeda/include/defines.h
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: defines.h
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/libgeda/include/defines.h,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -b -r1.43 -r1.44
  --- defines.h	8 Feb 2005 22:26:16 -0000	1.43
  +++ defines.h	14 Feb 2005 02:17:34 -0000	1.44
  @@ -355,7 +355,4 @@
   #define M_PI  3.14159265358979323846
   #endif
   
  -/* why guile doesn't come with this, I don't know */
  -#define MEM02STR(x) scm_mem2string((x), strlen(x))
  -
   #endif
  
  
  

  Modified:    .        g_basic.nw g_smob.nw
  Log:
  put back scm_makfrom0str().  It is scm_makfromstr() which was deprecated,
  
  scm_makfrom0str() is still ok.  Suggested by Patrick Bernaud.
  
  
  
  
  Revision  Changes    Path
  1.9       +8 -8      eda/geda/devel/libgeda/noweb/g_basic.nw
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: g_basic.nw
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/libgeda/noweb/g_basic.nw,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- g_basic.nw	8 Feb 2005 22:26:16 -0000	1.8
  +++ g_basic.nw	14 Feb 2005 02:17:36 -0000	1.9
  @@ -142,26 +142,26 @@
   	 */
   
       if (!scm_eq_p (tag, scm_str2symbol ("misc-error"))) {
  -               scm_display(MEM02STR("Error : "), cur_out);
  +               scm_display(scm_makfrom0str("Error : "), cur_out);
   		scm_display(tag, cur_out);
   			
  -		scm_display(MEM02STR(" [C:"), cur_out);
  +		scm_display(scm_makfrom0str(" [C:"), cur_out);
   		scm_display(scm_port_column(load_port), cur_out );
  -		scm_display(MEM02STR(" L:"), cur_out);
  +		scm_display(scm_makfrom0str(" L:"), cur_out);
   		scm_display(scm_port_line(load_port), cur_out );
  -		scm_display(MEM02STR("]"), cur_out);
  +		scm_display(scm_makfrom0str("]"), cur_out);
   	} else {
  -		scm_display(MEM02STR("Probably parenthesis mismatch"), 
  +		scm_display(scm_makfrom0str("Probably parenthesis mismatch"), 
   			    cur_out);
   
   	}
   
  -	scm_display(MEM02STR(" in "), cur_out);
  +	scm_display(scm_makfrom0str(" in "), cur_out);
   	scm_display(filename, cur_out);
   	scm_newline(cur_out);
   
   	if (most_recently_read_form != SCM_BOOL_F) {
  -		scm_display(MEM02STR ("Most recently read form: "),
  +		scm_display(scm_makfrom0str ("Most recently read form: "),
   			    cur_out);
   		scm_display(most_recently_read_form, cur_out);
   		scm_newline(cur_out);
  @@ -195,7 +195,7 @@
   		return(-1);
     	}
   
  -	port = scm_open_file(MEM02STR(filename), MEM02STR("r"));
  +	port = scm_open_file(scm_makfrom0str(filename), scm_makfrom0str("r"));
   
   	eval_result = scm_internal_catch (SCM_BOOL_T,
                                         (scm_t_catch_body)load,
  
  
  
  1.9       +3 -3      eda/geda/devel/libgeda/noweb/g_smob.nw
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: g_smob.nw
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/libgeda/noweb/g_smob.nw,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- g_smob.nw	8 Feb 2005 22:26:16 -0000	1.8
  +++ g_smob.nw	14 Feb 2005 02:17:36 -0000	1.9
  @@ -118,7 +118,7 @@
         attribute->attribute->object->text &&
         attribute->attribute->object->text->string ) {
       scm_puts("#<attribute ", port);
  -    scm_display (MEM02STR (attribute->attribute->object->text->string),
  +    scm_display (scm_makfrom0str (attribute->attribute->object->text->string),
                    port);
       scm_puts(">", port);
     }
  @@ -182,8 +182,8 @@
         attribute->attribute->object->text->string ) {
       o_attrib_get_name_value(attribute->attribute->object->text->string, 
                               &name, &value );
  -    returned = scm_cons (MEM02STR (name),
  -                         MEM02STR (value));
  +    returned = scm_cons (scm_makfrom0str (name),
  +                         scm_makfrom0str (value));
       if (name) free(name);
       if (value) free(value);
     }