mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-21 07:20:28 -04:00
Commit of the new UDP Connection methods and
the rewrite of the retroshare core networking stack. This check-in commits the changes to the rsserver code. Major changes to use the new networking code. Added p3peers.h as a new interface for peer/neighbour management. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@314 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
7c2d5611bd
commit
fd8adceb7e
13 changed files with 1039 additions and 701 deletions
|
@ -525,12 +525,12 @@ std::string getX509Info(X509 *cert)
|
|||
* into a string.
|
||||
*/
|
||||
|
||||
static char *TIME_FORMAT_STR_BRIEF = "%H:%M:%S";
|
||||
static char *TIME_FORMAT_STR_OLDVAGUE_NOW = "%H:%M:%S";
|
||||
static char *TIME_FORMAT_STR_OLDVAGUE_WEEK = "%a %H:%M";
|
||||
static char *TIME_FORMAT_STR_OLDVAGUE_OLD = "%a, %d %b";
|
||||
static char *TIME_FORMAT_STR_LONG = "%c";
|
||||
static char *TIME_FORMAT_STR_NORMAL = "%a, %H:%M:%S";
|
||||
static const char *TIME_FORMAT_STR_BRIEF = "%H:%M:%S";
|
||||
static const char *TIME_FORMAT_STR_OLDVAGUE_NOW = "%H:%M:%S";
|
||||
static const char *TIME_FORMAT_STR_OLDVAGUE_WEEK = "%a %H:%M";
|
||||
static const char *TIME_FORMAT_STR_OLDVAGUE_OLD = "%a, %d %b";
|
||||
static const char *TIME_FORMAT_STR_LONG = "%c";
|
||||
static const char *TIME_FORMAT_STR_NORMAL = "%a, %H:%M:%S";
|
||||
|
||||
std::string timeFormat(int epoch, int format)
|
||||
{
|
||||
|
@ -539,7 +539,7 @@ std::string timeFormat(int epoch, int format)
|
|||
|
||||
size_t msize = 1024;
|
||||
char space[msize];
|
||||
char *fmtstr = NULL;
|
||||
const char *fmtstr = NULL;
|
||||
|
||||
if (format == TIME_FORMAT_OLDVAGUE)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue