Fossil: Check-in [6f3b0f34]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	superflueous semicolon.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| eclipse-project
Files:	files \| file ages \| folders
SHA1:	6f3b0f344510f684b5b73a3925c6d63f5f3346d5
User & Date:	jan.nijtmans 2012-09-05 09:05:26

Context

2012-09-05
09:26		be smarter about istty static initialization check-in: 5d9f57a7 user: jan.nijtmans tags: eclipse-project
09:05		superflueous semicolon. check-in: 6f3b0f34 user: jan.nijtmans tags: eclipse-project
09:00		fix writing to stderr console, last commit broke that. check-in: b4bab791 user: jan.nijtmans tags: eclipse-project

Changes

Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/file.c.

#endif
  return zValue;
}

/*
** Display UTF8 on the console.  Return the number of
** Characters written. If stdout or stderr is redirected
** to a file, -1 is returned and ** nothing is written
** to the console.
*/
int fossil_utf8_to_console(const char *zUtf8, int nByte, int toStdErr){
#ifdef _WIN32
  int nChar;
  wchar_t *zUnicode; /* Unicode version of zUtf8 */
  DWORD dummy;
................................................................................
    return 0;
  }
  nChar = MultiByteToWideChar(CP_UTF8, 0, zUtf8, nByte, zUnicode, nChar);
  if( nChar==0 ){
    free(zUnicode);
    return 0;
  }
  zUnicode[nChar] = '\0';;
  WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE - toStdErr), zUnicode, nChar, &dummy, 0);
  return nChar;
#else
  return -1;  /* No-op on unix */
#endif  
}

#endif
  return zValue;
}

/*
** Display UTF8 on the console.  Return the number of
** Characters written. If stdout or stderr is redirected
** to a file, -1 is returned and nothing is written
** to the console.
*/
int fossil_utf8_to_console(const char *zUtf8, int nByte, int toStdErr){
#ifdef _WIN32
  int nChar;
  wchar_t *zUnicode; /* Unicode version of zUtf8 */
  DWORD dummy;
................................................................................
    return 0;
  }
  nChar = MultiByteToWideChar(CP_UTF8, 0, zUtf8, nByte, zUnicode, nChar);
  if( nChar==0 ){
    free(zUnicode);
    return 0;
  }
  zUnicode[nChar] = '\0';
  WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE - toStdErr), zUnicode, nChar, &dummy, 0);
  return nChar;
#else
  return -1;  /* No-op on unix */
#endif  
}