Backport some changes from trunk.

[cygwin-apps/setup.git] / netio.h

diff --git a/netio.h b/netio.h
index 9cd47e1a23cbd0e03bce3184864e6bddf043c2ce..af7ed639d5d69966c7cfeaea88ee7a049dff2328 100644 (file)
--- a/netio.h
+++ b/netio.h
@@ -13,13 +13,17 @@
  *
  */
 
+#ifndef SETUP_NETIO_H
+#define SETUP_NETIO_H
+
 /* This is the parent class for all the access methods known to setup
    (i.e. ways to download files from the internet or other sources */
 
-class NetIO {
+class NetIO
+{
 protected:
-  NetIO (char *url, BOOL allow_ftp_auth = FALSE);
-  void set_url (char *url);
+  NetIO (char const *url);
+  void set_url (char const *url);
   BOOL ftp_auth;
 
 public:
@@ -31,13 +35,13 @@ public:
   char *host;
   int port;
   char *path;
-  virtual ~NetIO ();
+    virtual ~ NetIO ();
 
   /* The user calls this function to create a suitable accessor for
      the given URL.  It uses the network setup state in state.h.  If
      anything fails, either the return values is NULL or the returned
      object is !ok() */
-  static NetIO * open (char *url, BOOL allow_ftp_auth = FALSE);
+  static NetIO *open (char const *url);
 
   /* If !ok() that means the transfer isn't happening. */
   virtual int ok ();
@@ -49,7 +53,9 @@ public:
   /* Helper functions for http/ftp protocols.  Both return nonzero for
      "cancel", zero for "ok".  They set net_proxy_user, etc, in
      state.h */
-  int get_auth ();
-  int get_proxy_auth ();
-  int get_ftp_auth ();
+  int get_auth (HWND owner);
+  int get_proxy_auth (HWND owner);
+  int get_ftp_auth (HWND owner);
 };
+
+#endif /* SETUP_NETIO_H */