Changeset 1660:99bfd21f00ef in roaraudio for libroar/basic.c

Timestamp:

05/08/09 16:56:40 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

changed name of fh in con struct to fh, this should all apps requiring the private member to fail to build, added function to get fh, change code to use them both everythere

File:

• libroar/basic.c (modified) (5 diffs)

libroar/basic.c

@@ -187 +187 @@
  memset(con, 0, sizeof(struct roar_connection));
 
- con->fh = fh;
+ con->__fh = fh;
 
  roar_errno = ROAR_ERROR_NONE;
  return 0;
+}
+
+int roar_get_connection_fh (struct roar_connection * con) {
+ return con->__fh;
 }
 
@@ -204 +208 @@
 
 #ifdef ROAR_HAVE_IO_POSIX
- close(con->fh);
-#endif
-
- con->fh = -1;
+ close(roar_get_connection_fh(con));
+#endif
+
+ roar_connect_fh(con, -2);
 
  roar_errno = ROAR_ERROR_NONE;
@@ -256 +260 @@
  struct roar_vio_calls vio;
 
- if ( roar_vio_open_fh_socket(&vio, con->fh) == -1 )
+ if ( roar_vio_open_fh_socket(&vio, roar_get_connection_fh(con)) == -1 )
   return -1;
 
@@ -298 +302 @@
  struct roar_vio_calls vio;
 
- if ( roar_vio_open_fh_socket(&vio, con->fh) == -1 )
+ if ( roar_vio_open_fh_socket(&vio, roar_get_connection_fh(con)) == -1 )
   return -1;
 
@@ -385 +389 @@
  struct roar_vio_calls vio;
 
- if ( roar_vio_open_fh_socket(&vio, con->fh) == -1 )
+ if ( roar_vio_open_fh_socket(&vio, roar_get_connection_fh(con)) == -1 )
   return -1;