[lld] r193375 - [PECOFF] Fix spelling in manifest XML.

[Sean Silva]

   out << "<?xml version=\"1.0\" standalone=\"yes\"?>\n"
       << "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\"\n"
       << "          manifestVersion=\"1.0\">\n"
-      << "  <trustinfo>\n"
+      << "  <trustInfo>\n"
       << "    <security>\n"
       << "      <requestedPrivileges>\n"
       << "         <requestedExecutionLevel level=" <<
ctx.getManifestLevel()
       << " uiAccess=" << ctx.getManifestUiAccess() << "/>\n"
       << "      </requestedPrivileges>\n"
       << "    </security>\n"
-      << "  </trustinfo>\n";
+      << "  </trustInfo>\n";

FYI, you can just eliminate the `<<`'s and the strings will be
concatenated. Might simplify this code a bit or make it a bit more
efficient.

-- Sean Silva


On Thu, Oct 24, 2013 at 6:08 PM, Rui Ueyama <ruiu at google.com> wrote:

> Author: ruiu
> Date: Thu Oct 24 17:08:19 2013
> New Revision: 193375
>
> URL: http://llvm.org/viewvc/llvm-project?rev=193375&view=rev
> Log:
> [PECOFF] Fix spelling in manifest XML.
>
> Modified:
>     lld/trunk/lib/Driver/WinLinkDriver.cpp
>     lld/trunk/test/pecoff/manifest.test
>
> Modified: lld/trunk/lib/Driver/WinLinkDriver.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/WinLinkDriver.cpp?rev=193375&r1=193374&r2=193375&view=diff
>
> ==============================================================================
> --- lld/trunk/lib/Driver/WinLinkDriver.cpp (original)
> +++ lld/trunk/lib/Driver/WinLinkDriver.cpp Thu Oct 24 17:08:19 2013
> @@ -223,14 +223,14 @@ std::string createManifestXml(PECOFFLink
>    out << "<?xml version=\"1.0\" standalone=\"yes\"?>\n"
>        << "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\"\n"
>        << "          manifestVersion=\"1.0\">\n"
> -      << "  <trustinfo>\n"
> +      << "  <trustInfo>\n"
>        << "    <security>\n"
>        << "      <requestedPrivileges>\n"
>        << "         <requestedExecutionLevel level=" <<
> ctx.getManifestLevel()
>        << " uiAccess=" << ctx.getManifestUiAccess() << "/>\n"
>        << "      </requestedPrivileges>\n"
>        << "    </security>\n"
> -      << "  </trustinfo>\n";
> +      << "  </trustInfo>\n";
>    const std::string &dependency = ctx.getManifestDependency();
>    if (!dependency.empty()) {
>      out << "  <dependency>\n"
>
> Modified: lld/trunk/test/pecoff/manifest.test
> URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/manifest.test?rev=193375&r1=193374&r2=193375&view=diff
>
> ==============================================================================
> --- lld/trunk/test/pecoff/manifest.test (original)
> +++ lld/trunk/test/pecoff/manifest.test Thu Oct 24 17:08:19 2013
> @@ -7,13 +7,13 @@
>  MANIFEST: ?xml version="1.0" standalone="yes"?>
>  MANIFEST: <assembly xmlns="urn:schemas-microsoft-com:asm.v1"
>  MANIFEST:           manifestVersion="1.0">
> -MANIFEST:   <trustinfo>
> +MANIFEST:   <trustInfo>
>  MANIFEST:     <security>
>  MANIFEST:       <requestedPrivileges>
>  MANIFEST:          <requestedExecutionLevel level='asInvoker'
> uiAccess='false'/>
>  MANIFEST:       </requestedPrivileges>
>  MANIFEST:     </security>
> -MANIFEST:   </trustinfo>
> +MANIFEST:   </trustInfo>
>  MANIFEST: </assembly>
>
>  # RUN: lld -flavor link /out:%t2.exe /subsystem:console /force /opt:noref
> \
> @@ -23,13 +23,13 @@ MANIFEST: </assembly>
>  UAC: ?xml version="1.0" standalone="yes"?>
>  UAC: <assembly xmlns="urn:schemas-microsoft-com:asm.v1"
>  UAC:           manifestVersion="1.0">
> -UAC:   <trustinfo>
> +UAC:   <trustInfo>
>  UAC:     <security>
>  UAC:       <requestedPrivileges>
>  UAC:          <requestedExecutionLevel level='requireAdministrator'
> uiAccess='true'/>
>  UAC:       </requestedPrivileges>
>  UAC:     </security>
> -UAC:   </trustinfo>
> +UAC:   </trustInfo>
>  UAC: </assembly>
>
>  # RUN: lld -flavor link /out:%t3.exe /subsystem:console /force /opt:noref
> \
> @@ -39,13 +39,13 @@ UAC: </assembly>
>  DEPENDENCY: ?xml version="1.0" standalone="yes"?>
>  DEPENDENCY: <assembly xmlns="urn:schemas-microsoft-com:asm.v1"
>  DEPENDENCY:           manifestVersion="1.0">
> -DEPENDENCY:   <trustinfo>
> +DEPENDENCY:   <trustInfo>
>  DEPENDENCY:     <security>
>  DEPENDENCY:       <requestedPrivileges>
>  DEPENDENCY:          <requestedExecutionLevel level='asInvoker'
> uiAccess='false'/>
>  DEPENDENCY:       </requestedPrivileges>
>  DEPENDENCY:     </security>
> -DEPENDENCY:   </trustinfo>
> +DEPENDENCY:   </trustInfo>
>  DEPENDENCY:   <dependency>
>  DEPENDENCY:     <dependentAssembly>
>  DEPENDENCY:       <assemblyIdentity foo='bar' />
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20131024/497c4226/attachment.html>