Commit e6cf1730 authored by Stewart Brodie's avatar Stewart Brodie
Browse files

Fix for strcoll

Detail:
  Somebody had modified the SWI call to Territory_Collate to be done
    via _swix instead of _kernel_swi, but didn't remove the _kernel_swi_regs
    variable (r) and didn't change the function return value to return the
    new "ret" variable instead of r.r[0] which gives arbitrary results - in
    particular it confuses qsort.
Admin:
  Tested that it builds.

Version 4.97. Tagged as 'RISC_OSLib-4_97'
parent 71094b4e
......@@ -6,9 +6,9 @@
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
Module_MajorVersion SETS "4.96"
Module_Version SETA 496
Module_MajorVersion SETS "4.97"
Module_Version SETA 497
Module_MinorVersion SETS ""
Module_Date SETS "21 Sep 1999"
Module_FullVersion SETS "4.96"
Module_Date SETS "22 Sep 1999"
Module_FullVersion SETS "4.97"
END
/* (4.96)
/* (4.97)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 4.96
#define Module_MajorVersion_CMHG 4.97
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 21 Sep 1999
#define Module_Date_CMHG 22 Sep 1999
#define Module_MajorVersion "4.96"
#define Module_Version 496
#define Module_MajorVersion "4.97"
#define Module_Version 497
#define Module_MinorVersion ""
#define Module_Date "21 Sep 1999"
#define Module_Date "22 Sep 1999"
#define Module_FullVersion "4.96"
#define Module_FullVersion "4.97"
......@@ -327,7 +327,6 @@ size_t strxfrm(char *s1, const char *s2, size_t n)
int strcoll(const char *a, const char *b)
{
_kernel_swi_regs r;
int ret;
if (strcoll_territory == 0) return strcmp(a, b); /* C locale */
......@@ -336,7 +335,7 @@ int strcoll(const char *a, const char *b)
&ret))
return 0;
return r.r[0];
return ret;
}
void _set_strcoll(int territory)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment