This fixes the dubious type signatures for mmap.
Mon Apr 28 12:08:37 PDT 2008 Jason Dagit <[EMAIL PROTECTED]>
* correct mmap type signatures
New patches:
[correct mmap type signatures
Jason Dagit <[EMAIL PROTECTED]>**20080428190837] hunk ./src/FastPackedString.hs 104
import Foreign.Marshal.Array ( pokeArray, mallocArray,
peekArray, advancePtr )
import Foreign.C.String
-import Foreign.C.Types ( CInt, )
+import Foreign.C.Types ( CInt, CSize )
import Data.Bits ( rotateL )
import Data.Char
import Data.Word
hunk ./src/FastPackedString.hs 596
#if defined(__GLASGOW_HASKELL__)
foreign import ccall unsafe "static fpstring.h my_mmap" my_mmap
- :: CInt -> CInt -> IO (Ptr Word8)
+ :: CSize -> CInt -> IO (Ptr Word8)
foreign import ccall unsafe "static sys/mman.h munmap" c_munmap
hunk ./src/FastPackedString.hs 598
- :: Ptr Word8 -> CInt -> IO CInt
+ :: Ptr Word8 -> CSize -> IO CInt
foreign import ccall unsafe "static unistd.h close" c_close
:: CInt -> IO CInt
#endif
hunk ./src/OldFastPackedString.hs 769
#if defined(__GLASGOW_HASKELL__)
foreign import ccall unsafe "static fpstring.h my_mmap" my_mmap
- :: CInt -> CInt -> IO (Ptr Word8)
+ :: CSize -> CInt -> IO (Ptr Word8)
foreign import ccall unsafe "static sys/mman.h munmap" c_munmap
hunk ./src/OldFastPackedString.hs 771
- :: Ptr Word8 -> CInt -> IO CInt
+ :: Ptr Word8 -> CSize -> IO CInt
foreign import ccall unsafe "static unistd.h close" c_close
:: CInt -> IO CInt
#endif
hunk ./src/fpstring.c 71
* of mmap in FastPackedString. Most arguments are ignored...
*/
-char *my_mmap(int length, int fd)
+char *my_mmap(size_t length, int fd)
{
exit(1); /* mmap is not implemented on Windows */
}
hunk ./src/fpstring.c 83
#else
-char *my_mmap(int len, int fd) {
+char *my_mmap(size_t len, int fd) {
void *maybeok = mmap(NULL, len, PROT_READ, MAP_SHARED, fd, 0);
if (maybeok == MAP_FAILED) return NULL;
else return (char *)maybeok;
hunk ./src/fpstring.h 11
int first_nonwhite(const char *s, int len);
int has_funky_char(const char *s, int len);
-char *my_mmap(int len, int fd);
+char *my_mmap(size_t len, int fd);
int utf8_to_ints(HsInt *pwc, const unsigned char *s, int n);
Context:
[give proper error message when slurping fails to identify a file or directory.
David Roundy <[EMAIL PROTECTED]>**20080423141737]
[default to not coloring hunks.
David Roundy <[EMAIL PROTECTED]>**20080423141725]
[Use the lineColoring to prettify hunks with colors.
Nicolas Pouillard <[EMAIL PROTECTED]>**20080420135252]
[Add line coloring support in Printer and ColourPrinter.
Nicolas Pouillard <[EMAIL PROTECTED]>**20080420135238]
[Export Printer.(<?>).
Nicolas Pouillard <[EMAIL PROTECTED]>**20080420135208]
[Add two colors (cyan and magenta), but not use them yet.
Nicolas Pouillard <[EMAIL PROTECTED]>**20080420122811]
[Refactor a little the color handling.
Nicolas Pouillard <[EMAIL PROTECTED]>**20080420122500]
[slim down the makefile based on Gwern's changes to the configure script.
David Roundy <[EMAIL PROTECTED]>**20080423131854]
[configure.ac: export -lcurses for cabal
[EMAIL PROTECTED]
[configure.ac: export Curses as well
[EMAIL PROTECTED]
[Little style change.
Nicolas Pouillard <[EMAIL PROTECTED]>**20080420122143]
[Define unDoc as field of Doc.
Nicolas Pouillard <[EMAIL PROTECTED]>**20080416075954]
[Replace colour by color to uniformise a bit.
Nicolas Pouillard <[EMAIL PROTECTED]>**20080416074742]
[Canonize G. Branwen, P. Rockai, L. Komolodin and R. Lamers.
Eric Kow <[EMAIL PROTECTED]>**20080422152346
All anonymous patches get assigned to Gwern.
]
[doc tweak
Eric Kow <[EMAIL PROTECTED]>**20080422151420]
[resolve issue809: doc: darcs get is not lazy by default.
Eric Kow <[EMAIL PROTECTED]>**20080422150809]
[doc: darcs-2 is no longer experimental.
Eric Kow <[EMAIL PROTECTED]>**20080422150736]
[Rename ColourPrinter to ColorPrinter.
Eric Kow <[EMAIL PROTECTED]>**20080421154043
We might as well standardize on American spelling in the code.
]
[eliminate duplicate get_remote_repo in favor of list comprehensions.
David Roundy <[EMAIL PROTECTED]>**20080421145642]
[resolve issue792: Account for --remote-repo in defaultrepo code
Eric Kow <[EMAIL PROTECTED]>**20080421144023]
[Extend command_argdefaults to accept [DarcsFlag].
Eric Kow <[EMAIL PROTECTED]>**20080421143950]
[Add a --remote-repodir flag (yet unused).
Eric Kow <[EMAIL PROTECTED]>**20080421134352]
[Account for pre-existing api-doc.
Eric Kow <[EMAIL PROTECTED]>**20080421135155]
[Create the api-doc dir if it does not exist.
Eric Kow <[EMAIL PROTECTED]>**20080421134800]
[replace '{-# OPTIONS' with '{-# OPTIONS_GHC'
[EMAIL PROTECTED]
These OPTIONS pragmas use GHC-isms; best practice is to make them GHC specific if they are GHC specific.
Specifically: -fglasgow-exts is obviously GHC only. -cpp is used only by GHC AFAIK - hugs uses some hugscpp, YHC uses '--cpp' as does presumably NHC, JHC doesn't support cpp, and no idea about the others.
However, this patch omits modifying "src/Darcs/ColourPrinter.lhs", "src/Workaround.hs", and "src/win32/CtrlC.hs" because I was uncertain whether '-fno-warn-orphans', '-w', and '-ffi' are actually GHC-only.
]
[configure.ac: export -DHAVE_LIBWWW for CPP
[EMAIL PROTECTED]
[resolve issue795: Make 'darcs changes -i' behave more like other jobs.
Eric Kow <[EMAIL PROTECTED]>**20080421105247
Old behaviour:
Shall I continue to view changes?
y - do not view this patch; keep going [DEFAULT]
n - quit
v - view this patch; keep going
q - quit
New behaviour:
Shall I view this patch?
y - view this patch; keep going
n - do not view this patch; keep going [DEFAULT]
v - view this patch; keep going
q - quit
]
[Undo a false refactor in SelectChanges.
Eric Kow <[EMAIL PROTECTED]>**20080421104106
The new old code makes it clearer that text_view is only used by
'view changes'
]
[Fix pluralization of patches using English module.
David Roundy <[EMAIL PROTECTED]>**20080421121716]
[configure.ac: move HAVE_CURL around
[EMAIL PROTECTED]
The dependency was inverted; we want to set HAVE_CURL before we test for Curl pipelining.
]
[optimized get --to-match handling for darcs 1 repositories
[EMAIL PROTECTED]
[stringify.hs: rw to avoid multi-line string literal
[EMAIL PROTECTED]
The reason we want to avoid multi-line string literals is because GHC and CPP can break them quite badly if accidentally applied.
In addition, no one is going to read Context.hs - it exists solely to be compiled. So removing the multi-line business in favor of one long string which will look exactly the same in the compiled binary causes no problems. And it can fix a big one - if Context.hs can't be compiled, obviously Darcs cannot.
]
[configure.ac: restructure curl
[EMAIL PROTECTED]
We want to make sure HAVE_CURL shows up in CPP flags.
]
[configure.ac: +mention why threaded is not default/doc
[EMAIL PROTECTED]
[rearrange bytestring tests so if it's not present we're quieter.
David Roundy <[EMAIL PROTECTED]>**20080418212319]
[configure.ac: fix bytestring checking
[EMAIL PROTECTED]
This changes bytestring to be default. However it checks twice: if either --disable-bytestring is set or bytestring can't be found, it won't pass on CPP -DHAVE_BYTESTRING. So this should work for Dr. Roundy's lack of bytestring.
]
[remove unneeded check for termio.h.
David Roundy <[EMAIL PROTECTED]>**20080417172427]
[configure.ac: rm line
[EMAIL PROTECTED]
I can't even figure out how long ago Control.Monad was in a 'util' package.
]
[we don't need Darcs.Patch.Check for darcs itself.
David Roundy <[EMAIL PROTECTED]>**20080417150720]
[remove hackish attempt to set GC parameters based on available memory.
David Roundy <[EMAIL PROTECTED]>**20080416164105]
[define forM_ since it is absent on GHC 6.4.1
[EMAIL PROTECTED]
[make darcs build on win32 by conditionally compiling out a few bits that are unused or meaningless on win32
[EMAIL PROTECTED]
[Don't let other configure flags change the type witnesses
Lennart Kolmodin <[EMAIL PROTECTED]>**20080415210614
For example, when using --with-docs the type witnesses would be turned on,
while with --without-docs they would not. This patch adresses this issue.
]
[eliminate use of Haskell 98 library modules.
David Roundy <[EMAIL PROTECTED]>**20080415214217]
[add type witness declarations to Resolution
David Roundy <[EMAIL PROTECTED]>**20080415165457]
[move -cpp option into source files.
David Roundy <[EMAIL PROTECTED]>**20080415144719]
[Issue a warning when using --old-fashioned-inventory with a darcs-2 repository.
Nicolas Pouillard <[EMAIL PROTECTED]>**20080414232715]
[FastPackedString.hs: FastPackedString.hs: redefine linePS/unlinesPS
[EMAIL PROTECTED]
Turns out that my definitions were wrong - they differed and added a newline where the old FPS versions didn't. So I've rewritten the wrapper versions around ByteString, and checked them against the old ones with QuickCheck. With these fixes, a bytestring darcs seems to pass all the tests as a fps darcs.
]
[remove unused Setup.lhs.
David Roundy <[EMAIL PROTECTED]>**20080414190738]
[roll back implementation of joke oops command.
David Roundy <[EMAIL PROTECTED]>**20080414133342
Apparently it didn't actually work...
rolling back:
Tue Apr 8 07:58:56 PDT 2008 David Roundy <[EMAIL PROTECTED]>
* resolve issue786: implement oops command.
M ./src/Darcs/Commands/Tag.lhs -5 +47
M ./src/Darcs/TheCommands.lhs -1 +2
]
[just remove concatLenPS
David Roundy <[EMAIL PROTECTED]>**20080411205303
It is never used in a performance-critical situation, so I'm voting to just
trash it. I'd rather have fewer unsafe operations.
]
[FastPackedString.hs: simplify concatLenPS, although this removes its strictness properties
**20080411035327]
[FastPackedString.hs: remove wfindPS
**20080411035046
With better imports from bytestring, I believe it to be superfluous, and dangerous to leave around.
]
[FastPackedString.hs: grmmr/sp
**20080411034730]
[FastPackedString.hs: rw linesPS using ByteString split
**20080411032229]
[doc updates
[EMAIL PROTECTED]
Convert all uses of 'http://darcs.net/repos/stable' to just darcs.net, since unstable and stable were merged together, and the old URL is a 404 for darcs getting. This is a real problem, see for example <http://reddit.com/info/6ewbq/comments/c03o6d5>.
]
[fix typo in show_bug_help
Matyas Janos <[EMAIL PROTECTED]>**20080408232600]
[Raise a configure error when no Text.Regex module can be found.
[EMAIL PROTECTED]
[update README url links
[EMAIL PROTECTED]
[add a bit more debugging info to repository identification.
David Roundy <[EMAIL PROTECTED]>**20080408151912]
[resolve issue385: don't worry if we can't get local changes.
David Roundy <[EMAIL PROTECTED]>**20080408151823]
[add test for issue385.
David Roundy <[EMAIL PROTECTED]>**20080408151808]
[resolve issue786: implement oops command.
David Roundy <[EMAIL PROTECTED]>**20080408145856]
[fix URL in network test.
David Roundy <[EMAIL PROTECTED]>**20080408145407]
[fix manual bug.
David Roundy <[EMAIL PROTECTED]>**20080407191736]
[add new show bug command (hidden) to see what darcs will report if we encounter a bug.
David Roundy <[EMAIL PROTECTED]>**20080407175410]
[automatically work out the version of the stable release.
David Roundy <[EMAIL PROTECTED]>**20080407171850]
[set prefs again (they got lost on convert).
David Roundy <[EMAIL PROTECTED]>**20080407171559]
[update darcs repository URL.
David Roundy <[EMAIL PROTECTED]>**20080407164601]
[fix up website for new release.
David Roundy <[EMAIL PROTECTED]>**20080407164010]
[simplify determine_release_state.pl.
David Roundy <[EMAIL PROTECTED]>**20080407153000]
[make determine_release_state.pl use changes --count.
David Roundy <[EMAIL PROTECTED]>**20080407152347]
[add --count output option to changes.
David Roundy <[EMAIL PROTECTED]>**20080407151825]
[TAG 2.0.0
David Roundy <[EMAIL PROTECTED]>**20080407150638]
Patch bundle hash:
e54c02b1f22eb815947bcd87a088f7853b75d384
_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users
