X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-guile.cc;h=e5cdbc77f2732aef18d0e38794ccbf950e9aa710;hb=5516a43e8bc85c3f58b3c004a9a7fde626408939;hp=bdfcae16486aac79287377dec4e3fac0794f3e48;hpb=11164b5cb08da70748b1e431adbe907f4314e75b;p=lilypond.git diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index bdfcae1648..e5cdbc77f2 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -118,7 +118,7 @@ ly_scm2string (SCM str) SCM ly_string2scm (string const &str) { - return scm_from_locale_stringn (str.c_str(), + return scm_from_locale_stringn (str.c_str (), str.length ()); } @@ -126,7 +126,7 @@ ly_string2scm (string const &str) char * ly_scm2newstr (SCM str, size_t *lenp) { - SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string"); + LY_ASSERT_TYPE (scm_is_string, str, 1); size_t len = scm_i_string_length (str); if (char *new_str = (char *) malloc ((len + 1) * sizeof (char))) @@ -308,7 +308,7 @@ ly_offsets2scm (vector os) for (vsize i = 0; i < os.size (); i++) { *tail = scm_cons (ly_offset2scm (os[i]), SCM_EOL); - tail = SCM_CDRLOC(*tail); + tail = SCM_CDRLOC (*tail); } return l; }