ruby/trema/action-common.c in trema-0.2.2.1 vs ruby/trema/action-common.c in trema-0.2.3

@@ -1,8 +1,6 @@
 /*
- * Author: Nick Karanatsios <[e-mail]>
- *
  * Copyright (C) 2008-2012 NEC Corporation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
  * published by the Free Software Foundation.
@@ -20,33 +18,21 @@
 
 #include <stdint.h>
 #include "ruby.h"
 
 
-/*
- * @return [Number] an IPv4 address in its numeric representation.
- */
 uint32_t
 nw_addr_to_i( VALUE nw_addr ) {
   return ( uint32_t ) NUM2UINT( rb_funcall( nw_addr, rb_intern( "to_i" ), 0 ) );
 }
 
 
-/*
- * @return [String] an IPv4 address in its text representation.
- */
-VALUE
-nw_addr_to_s( VALUE nw_addr ) {
-  return rb_funcall( nw_addr, rb_intern( "to_s" ), 0 );
-}
-
-
 uint8_t *
-dl_addr_short( VALUE dl_addr, uint8_t *ret_dl_addr ) {
-  VALUE mac_arr = rb_funcall( dl_addr, rb_intern( "to_short" ), 0 );
+dl_addr_to_a( VALUE dl_addr, uint8_t *ret_dl_addr ) {
+  VALUE mac_arr = rb_funcall( dl_addr, rb_intern( "to_a" ), 0 );
   int i;
 
-  for ( i = 0; i < RARRAY_LEN( mac_arr); i++ ) {
+  for ( i = 0; i < RARRAY_LEN( mac_arr ); i++ ) {
     ret_dl_addr[ i ] = ( uint8_t ) ( NUM2INT( RARRAY_PTR( mac_arr )[ i ] ) );
   }
   return ret_dl_addr;
 }