Merge branches 'retrieve_h' and 'janitor', remote-tracking branch 'jfranklin9000/maint-mass' into maint-0.4

This commit is contained in:
Raymond Pasco 2017-06-28 09:30:30 -04:00
commit eaab4ea4c9
3 changed files with 17 additions and 3 deletions

View File

@ -242,7 +242,7 @@
/* u3r_trel(): /* u3r_trel():
** **
** Divide `a` as a trel `[b c]`. ** Divide `a` as a trel `[b c d]`.
*/ */
c3_o c3_o
u3r_trel(u3_noun a, u3r_trel(u3_noun a,
@ -252,7 +252,7 @@
/* u3r_qual(): /* u3r_qual():
** **
** Divide (a) as a qual [b c d e f]. ** Divide (a) as a qual [b c d e].
*/ */
c3_o c3_o
u3r_qual(u3_noun a, u3r_qual(u3_noun a,
@ -273,6 +273,19 @@
u3_noun* e, u3_noun* e,
u3_noun* f); u3_noun* f);
/* u3r_hext():
**
** Divide (a) as a hext [b c d e f g].
*/
c3_o
u3r_hext(u3_noun a,
u3_noun* b,
u3_noun* c,
u3_noun* d,
u3_noun* e,
u3_noun* f,
u3_noun* g);
/* u3r_p(): /* u3r_p():
** **
** & [0] if [a] is of the form [b *c]. ** & [0] if [a] is of the form [b *c].

View File

@ -633,7 +633,7 @@ u3m_bail(u3_noun how)
} }
if ( &(u3H->rod_u) == u3R ) { if ( &(u3H->rod_u) == u3R ) {
// For top-level errors, which shouln't happen often, we have no // For top-level errors, which shouldn't happen often, we have no
// choice but to use the signal process; and we require the flat // choice but to use the signal process; and we require the flat
// form of how. // form of how.
// //

View File

@ -1129,6 +1129,7 @@ _http_release_ports_file(c3_c *pax_c)
snprintf(paf_c, pal_i, "%s/%s", pax_c, ".http.ports"); snprintf(paf_c, pal_i, "%s/%s", pax_c, ".http.ports");
unlink(paf_c); unlink(paf_c);
u3a_free(paf_c);
} }
/* u3_http_io_init(): initialize http I/O. /* u3_http_io_init(): initialize http I/O.