儲存庫 vbox 的更動 16487

時間撮記:

2009-2-3 下午01:39:37 (16 年 以前)

作者:

vboxsync

訊息:

cbinding: No $Id$ keywords in samples, just $Revision$. The keyword string goes before the @file. The file start with one sentence outlining the purpose of the file, further explanation follows in a separate paragraph. Files use *one* brace and space-before-paranthesis style, esp. sample files. Do not exit() from main(), return from it. stuff -> _stuff since the double underscore namespace is reserved the system/compiler/libc. Finally, why unconditional logging and why doing it using cout/cerr?

位置:

trunk/src/VBox/Main/cbinding

檔案:

• cbinding.h (修改) (2 筆差異, 1 屬性更動)
• libXPCOMtoC.cpp (修改) (4 筆差異, 1 屬性更動)
• makefile.tstLinuxC (修改) (2 筆差異, 1 屬性更動)
• tstLinuxC.c (修改) (17 筆差異, 1 屬性更動)

trunk/src/VBox/Main/cbinding/cbinding.h

@@ +1 @@
+/* $Revision$ */
 /** @file cbinding.h
- *
  * C binding for XPCOM.
- *
- * $Id$
  */
 
-#ifndef __cbinding_h__
-#define __cbinding_h__
+#ifndef ___cbinding_h
+#define ___cbinding_h
 
 /*
@@ -58 +56 @@
 #endif
 
-#endif /* __cbinding_h__ */
+#endif /* !___cbinding_h */
+

trunk/src/VBox/Main/cbinding/libXPCOMtoC.cpp

@@ +1 @@
+/* $Id$ */
 /** @file libXPCOMtoC.cpp
- *
  * Utility functions to use with the C binding for XPCOM.
- *
- * $Id$
  */
 
@@ -84 +82 @@
 void VBoxComUnallocStr(PRUnichar *str_dealloc)
 {
-    if (str_dealloc) {
+    if (str_dealloc)
+    {
         nsMemory::Free(str_dealloc);
     }
@@ -91 +90 @@
 void VBoxComUnallocIID(nsIID *iid)
 {
-    if (iid) {
+    if (iid)
+    {
         nsMemory::Free(iid);
     }
@@ -105 +105 @@
     Session     = *session;
     Ivirtualbox = *virtualBox;
+
+/** @todo r=bird: Why is cout/cerr used unconditionally here?
+ * It would be preferred to use RTPrintf/RTStrmPrintf(g_pStdErr,..). If this is
+ * going to be used in real life, the cout(/RTPrintf) bits should be optional,
+ * add a flag argument and define VBOXCOMINIT_FLAG_VERBOSE for the purpose. */
 
     // All numbers on stderr in hex prefixed with 0X.

trunk/src/VBox/Main/cbinding/makefile.tstLinuxC

@@ -1 @@
-# $Id: Makefile 42209 2009-01-29 12:22:10Z jens $
+# $Revision$
+## @file makefile.tstLinuxC
+# Makefile for sample program illustrating use of C binding for XPCOM.
 #
-## @file makefile.tstLinuxC
-#
-# Makefile for sample program illustrating use of C binding for XPCOM.
 
 #
@@ -50 +49 @@
         echo "env VBOX_XPCOM_HOME=$(PATH_BIN) LD_LIBRARY_PATH=$(PATH_BIN) ./tstLinuxC" > $@
         chmod a+x $@
+

trunk/src/VBox/Main/cbinding/tstLinuxC.c

@@ +1 @@
+/* $Revsion: $ */
 /** @file tstLinuxC.c
- *
  * Demonstrator program to illustrate use of C bindings of Main API.
+ *
  * Linux only at the moment due to shared library magic in the Makefile.
- *
- * $Id$
  */
 
@@ -26 +25 @@
 #include <string.h>
 #include <stdlib.h>
-#include <iconv.h>
 #include "cbinding.h"
 
@@ -77 +75 @@
     if (NS_FAILED(rc))
     {
-        fprintf (stderr, "could not get list of machines, rc=%08x\n",
+        fprintf(stderr, "could not get list of machines, rc=%08x\n",
             (unsigned)rc);
         return;
@@ -95 +93 @@
         printf("\tMachine #%u\n", (unsigned)i);
 
-        if (!machine) {
+        if (!machine)
+        {
             printf("\t(skipped, NULL)\n");
             continue;
         }
 
-        machine->vtbl->GetAccessible (machine, &isAccessible);
+        machine->vtbl->GetAccessible(machine, &isAccessible);
 
         if (isAccessible)
@@ -118 +117 @@
 
         {
-            nsID  *iid          = nsnull;
+            nsID  *iid = NULL;
             char  *uuidString;
 
@@ -153 +152 @@
                 PRUnichar *typeId;
                 PRUnichar *osName;
-                IGuestOSType *osType = nsnull;
+                IGuestOSType *osType = NULL;
 
                 machine->vtbl->GetOSTypeId(machine, &typeId);
@@ -171 +170 @@
      */
 
-    printf ("Type Machine# to start (0 - %u) or 'quit' to do nothing: ",
+    printf("Type Machine# to start (0 - %u) or 'quit' to do nothing: ",
         (unsigned)(machineCnt - 1));
-    fflush (stdout);
-
-    if (scanf ("%u", &start_id) == 1 && start_id < machineCnt) {
+    fflush(stdout);
+
+    if (scanf("%u", &start_id) == 1 && start_id < machineCnt)
+    {
         IMachine *machine = machines[start_id];
 
-        if (machine) {
-            nsID  *iid = nsnull;
+        if (machine)
+        {
+            nsID  *iid = NULL;
 
             machine->vtbl->GetId(machine, &iid);
@@ -192 +193 @@
      */
 
-    for (i = 0; i < machineCnt; ++i) {
+    for (i = 0; i < machineCnt; ++i)
+    {
         IMachine *machine = machines[i];
 
-        if (machine) {
+        if (machine)
+        {
             machine->vtbl->nsisupports.Release((void *)machine);
         }
@@ -220 +223 @@
     if (NS_FAILED(rc) || !machine)
     {
-        fprintf (stderr, "Error: Couldn't get the machine handle.\n");
+        fprintf(stderr, "Error: Couldn't get the machine handle.\n");
         return;
     }
@@ -237 +240 @@
     VBoxUtf16Free(sessionType);
 
-    if (NS_FAILED (rc))
-    {
-        fprintf (stderr, "Error: OpenRemoteSession failed.\n");
+    if (NS_FAILED(rc))
+    {
+        fprintf(stderr, "Error: OpenRemoteSession failed.\n");
     }
     else
@@ -250 +253 @@
 
         rc = progress->vtbl->GetCompleted(progress, &completed);
-        if (NS_FAILED (rc))
+        if (NS_FAILED(rc))
         {
             fprintf (stderr, "Error: GetCompleted status failed.\n");
@@ -263 +266 @@
             progress->vtbl->GetErrorInfo(progress, &errorInfo);
             errorInfo->vtbl->GetText(errorInfo, &text);
-            printf ("[!] Text        = %s\n", VBoxConvertPRUnichartoAscii (text));
+            printf("[!] Text        = %s\n", VBoxConvertPRUnichartoAscii (text));
         }
         else
         {
-            fprintf (stderr, "Remote session has been successfully opened.\n");
+            fprintf(stderr, "Remote session has been successfully opened.\n");
         }
         progress->vtbl->nsisupports.Release((void *)progress);
@@ -288 +291 @@
 
     printf("Starting Main\n");
+
     /*
      * VBoxComInitialize does all the necessary startup action and
@@ -294 +298 @@
      * when done.
      */
+
     VBoxComInitialize(&vbox, &session);
 
-    if (vbox == NULL) {
-        fprintf (stderr, "%s: FATAL: could not get vbox handle\n", argv[0]);
-        exit (EXIT_FAILURE);
-    }
-    if (session == NULL) {
+    if (vbox == NULL)
+    {
+        fprintf(stderr, "%s: FATAL: could not get vbox handle\n", argv[0]);
+        return EXIT_FAILURE;
+    }
+    if (session == NULL)
+    {
         fprintf (stderr, "%s: FATAL: could not get session handle\n", argv[0]);
-        exit (EXIT_FAILURE);
+        return EXIT_FAILURE;
     }
 
@@ -310 +317 @@
      * remains easy to see how we access C++'s vtable.
      */
+
     printf("----------------------------------------------------\n");
 
@@ -361 +369 @@
      * Do as mom told us: always clean up after yourself.
      */
+
     VBoxComUninitialize();
     printf("Finished Main\n");
@@ -367 +376 @@
 }
 /* vim: set ts=4 sw=4 et: */
+