Security-58286.60.28.tar.gz

[apple/security.git] / SecurityTool / db_commands.cpp

diff --git a/SecurityTool/db_commands.cpp b/SecurityTool/db_commands.cpp
index fb17ae42e149fdf6c1b8f34fdf157bc5529fc74f..381501f9bf1d5b59363713f295b95f18431d2a43 100644 (file)
--- a/SecurityTool/db_commands.cpp
+++ b/SecurityTool/db_commands.cpp
@@ -25,8 +25,8 @@
 
 #include "db_commands.h"
 
 
 #include "db_commands.h"
 

-#include "readline.h"
-#include "security.h"
+#include "readline_cssm.h"
+#include "security_tool.h"

 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>


@@ -88,7 +88,7 @@ parse_guid(const char *name, CSSM_GUID *guid)
        else
        {
                sec_error("Invalid guid: %s", name);
        else
        {
                sec_error("Invalid guid: %s", name);

-               return 2;
+               return SHOW_USAGE_MESSAGE;

        }
 
        return 0;
        }
 
        return 0;


@@ -167,7 +167,7 @@ db_create(int argc, char * const *argv)
                        break;
                case '?':
                default:
                        break;
                case '?':
                default:

-                       return 2; /* @@@ Return 2 triggers usage message. */
+                       return SHOW_USAGE_MESSAGE;

                }
        }
 
                }
        }