System.Data.SQLite
Check-in [7787880672]
Not logged in

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

Overview
Comment:Fix typo in trace message and the formatting of a comment.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | refactorNativeLibraryPreLoader
Files: files | file ages | folders
SHA1: 77878806728feaa8a5c8002db6a3d6e218caf9f4
User & Date: mistachkin 2013-12-27 11:52:32
Context
2013-12-28
12:18
Merge updates from trunk. check-in: 630e317c4e user: mistachkin tags: refactorNativeLibraryPreLoader
2013-12-27
11:52
Fix typo in trace message and the formatting of a comment. check-in: 7787880672 user: mistachkin tags: refactorNativeLibraryPreLoader
11:31
Fix typo in comment. Update master release archive manifest. check-in: 3da479b0ff user: mistachkin tags: refactorNativeLibraryPreLoader
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to System.Data.SQLite/UnsafeNativeMethods.cs.

191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
...
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
#endif
          {
#if !NET_COMPACT_20 && TRACE_SHARED
              try
              {
                  Trace.WriteLine(String.Format(
                      CultureInfo.CurrentCulture,
                      "Native library pre-loader failed to get variable " +
                      "\"{0}\" value: {1}", name, e)); /* throw */
              }
              catch
              {
                  // do nothing.
              }
#endif
................................................................................
              //
              processorArchitecture = "x86";

#if !NET_COMPACT_20 && TRACE_PRELOAD
              try
              {
                  //
                  // NOTE: Show that we hit a fairly unusual situation (i.e. the
                  //       "wrong" processor architecture was detected).
                  //
                  Trace.WriteLine(String.Format(
                      CultureInfo.CurrentCulture,
                      "Native library pre-loader detected {0}-bit pointer " +
                      "size with processor architecture \"{1}\", using " +
                      "processor architecture \"{2}\" instead...",
                      IntPtr.Size * 8 /* bits */, savedProcessorArchitecture,







|







 







|
|







191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
...
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
#endif
          {
#if !NET_COMPACT_20 && TRACE_SHARED
              try
              {
                  Trace.WriteLine(String.Format(
                      CultureInfo.CurrentCulture,
                      "Native library pre-loader failed to get setting " +
                      "\"{0}\" value: {1}", name, e)); /* throw */
              }
              catch
              {
                  // do nothing.
              }
#endif
................................................................................
              //
              processorArchitecture = "x86";

#if !NET_COMPACT_20 && TRACE_PRELOAD
              try
              {
                  //
                  // NOTE: Show that we hit a fairly unusual situation (i.e.
                  //       the "wrong" processor architecture was detected).
                  //
                  Trace.WriteLine(String.Format(
                      CultureInfo.CurrentCulture,
                      "Native library pre-loader detected {0}-bit pointer " +
                      "size with processor architecture \"{1}\", using " +
                      "processor architecture \"{2}\" instead...",
                      IntPtr.Size * 8 /* bits */, savedProcessorArchitecture,